diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-06-25 13:45:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-25 13:45:20 +0200 |
| commit | b7084fef4c850d0352488b14dcff0f36a7e75e1c (patch) | |
| tree | 3d25416dd2636660df19149a11d4bcbe0c715bd8 | |
| parent | a5175fe48934522e3a82fe22bc5f7ee9c3d5f7dd (diff) | |
| download | rneovim-b7084fef4c850d0352488b14dcff0f36a7e75e1c.tar.gz rneovim-b7084fef4c850d0352488b14dcff0f36a7e75e1c.tar.bz2 rneovim-b7084fef4c850d0352488b14dcff0f36a7e75e1c.zip | |
fix(build): strip trailing newline from variable (#19084)
Problem: #19029 added a new fallback that sets
`$MACOSX_DEPLOYMENT_TARGET` to the local macOS version via `sw_vers`.
However, the output included a newline, which broke the generated Ninja
build script.
Solution: use `OUTPUT_STRIP_TRAILING_WHITESPACE` for `execute_process`.
| -rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index 23422f2708..c8d5b39398 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -64,7 +64,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_OSX_DEPLOYMENT_TARGET) set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") else() - execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE MACOS_VERSION) + execute_process(COMMAND sw_vers -productVersion + OUTPUT_VARIABLE MACOS_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${MACOS_VERSION}") endif() else() |