aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordm1try <me@dmitry.it>2018-10-16 03:35:15 +0300
committerdm1try <me@dmitry.it>2018-10-17 16:26:19 +0300
commit913588466dc981d5c1295f1a98e4de5e63b86a37 (patch)
treed27897d2cc6eb40127de5700a2880d7768d72742
parent8fd092f3ff15bf70f84ec0d716c5aaa2c7379fa1 (diff)
downloadrneovim-913588466dc981d5c1295f1a98e4de5e63b86a37.tar.gz
rneovim-913588466dc981d5c1295f1a98e4de5e63b86a37.tar.bz2
rneovim-913588466dc981d5c1295f1a98e4de5e63b86a37.zip
build/macOS: fix luajit install step
prevent luajit to assigning default value to MACOSX_DEPLOYMENT_TARGET ref #9050
-rw-r--r--third-party/cmake/BuildLuajit.cmake11
1 files changed, 10 insertions, 1 deletions
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake
index 721bca9f63..e965927f4e 100644
--- a/third-party/cmake/BuildLuajit.cmake
+++ b/third-party/cmake/BuildLuajit.cmake
@@ -50,8 +50,17 @@ set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
install)
if(UNIX)
+ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ # Set MACOSX_DEPLOYMENT_TARGET (else luajit defaults to 10.4). #9050
+ # https://github.com/LuaJIT/LuaJIT/blob/b025b01c5b9d23f6218c7d72b7aafa3f1ab1e08a/src/Makefile#L301-L303
+ set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+ else()
+ set(DEPLOYMENT_TARGET "")
+ endif()
+
BuildLuaJit(INSTALL_COMMAND ${INSTALLCMD_UNIX}
- CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR})
+ CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR}
+ ${DEPLOYMENT_TARGET})
elseif(MINGW AND CMAKE_CROSSCOMPILING)