diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2021-10-29 17:54:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-29 17:54:59 +0200 |
| commit | 6acfbd810d31e8c2771a475388568925dc90d141 (patch) | |
| tree | ba44b562b155c46d35d506b7e75632e9102ea7bb | |
| parent | d1c470957b49380ec5ceba603dbd85a14f60f09b (diff) | |
| download | rneovim-6acfbd810d31e8c2771a475388568925dc90d141.tar.gz rneovim-6acfbd810d31e8c2771a475388568925dc90d141.tar.bz2 rneovim-6acfbd810d31e8c2771a475388568925dc90d141.zip | |
build(deps): bump luajit to latest commit (#16041)
bump LuaJIT to https://github.com/LuaJIT/LuaJIT/commit/b4b2dce9fc3ffaaaede39b36d06415311e2aa516
now requires `-funwind-tables` build flag, which conflicts with
`-DLUA_USE_ASSERT`
| -rw-r--r-- | third-party/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 29ff0daa8d..f81dbeb3f4 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -151,8 +151,8 @@ set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0 set(MSGPACK_SHA256 bfbb71b7c02f806393bc3cbc491b40523b89e64f83860c58e3e54af47de176e4) # https://github.com/LuaJIT/LuaJIT/tree/v2.1 -set(LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/787736990ac3b7d5ceaba2697c7d0f58f77bb782.tar.gz) -set(LUAJIT_SHA256 2e3f74bc279f46cc463abfc67b36e69faaf0366237004771f4cac4bf2a9f5efb) +set(LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/b4b2dce9fc3ffaaaede39b36d06415311e2aa516.tar.gz) +set(LUAJIT_SHA256 6c9e46877db2df16ca0fa76db4043ed30a1ae60c89d9ba2c3e4d35eb2360cd4d) set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz) set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333) diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index 512d5ef5ae..13d6ee487a 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -53,12 +53,12 @@ else() endif() set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC CFLAGS+=-DLUA_USE_APICHECK - CFLAGS+=-DLUA_USE_ASSERT + CFLAGS+=-funwind-tables ${NO_STACK_CHECK} ${AMD64_ABI} CCDEBUG+=-g Q= - install) + amalg install) if(UNIX) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") @@ -109,7 +109,7 @@ elseif(MINGW) BuildLuaJit(BUILD_COMMAND ${LUAJIT_MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} CFLAGS+=-DLUA_USE_APICHECK - CFLAGS+=-DLUA_USE_ASSERT + CFLAGS+=-funwind-tables CCDEBUG+=-g BUILDMODE=static # Build a DLL too |