diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-11-28 10:14:30 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2020-12-13 21:03:27 -0500 |
| commit | 9c5b4c87e19657d605f1917503be54298967ad45 (patch) | |
| tree | bf464d3a69ccd5d6fa5a8c4d2a961344ab076a95 | |
| parent | 27ddaa39db6ae18c2a6e4c1b816f3ee35466d05c (diff) | |
| download | rneovim-9c5b4c87e19657d605f1917503be54298967ad45.tar.gz rneovim-9c5b4c87e19657d605f1917503be54298967ad45.tar.bz2 rneovim-9c5b4c87e19657d605f1917503be54298967ad45.zip | |
third-party: Always set DEPLOYMENT_TARGET when building LuaJIT on macOS
LuaJIT build now requires specifying a deployment target, so use the
same baseline as our nightly builds.
Co-authored-by: Christian Clason <christian.clason@uni-due.de>
| -rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index c0b24fb2a5..ca41a7cee3 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -64,9 +64,12 @@ set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC 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}") + if(CMAKE_OSX_DEPLOYMENT_TARGET) + set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") + else() + # Use the same target as our nightly builds + set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.11") + endif() else() set(DEPLOYMENT_TARGET "") endif() |