[Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

Sergey Kaplun skaplun at tarantool.org
Wed Jun 2 18:59:58 MSK 2021


This patch fixes inaccuracy in Tarantool build configuration introduced
by commit 07c83aa ('build: adjust
LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and
LUA_USE_APICHECK correspondingly. This patch fixes these typos.

Follows up #4862
---

Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix


Also, LUAJIT_USE_ASAN -- is set, but LuaJIT checks for ENABLE_ASAN as
is with corresponding FIXME to implement ASAN correctly. But it
looks like it should be done in a separate patch by enabling all LuaJIT
build flags, see list of options here [1].

[1]: https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/

 cmake/luajit.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake
index 6a94327a7..92cc88e70 100644
--- a/cmake/luajit.cmake
+++ b/cmake/luajit.cmake
@@ -49,9 +49,9 @@ set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua"
 
 # Enable internal LuaJIT assertions for Tarantool Debug build.
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(LUAJIT_USE_APICHECK ON CACHE BOOL
+    set(LUA_USE_APICHECK ON CACHE BOOL
         "Assertions for the Lua/C API" FORCE)
-    set(LUAJIT_USE_ASSERT ON CACHE BOOL
+    set(LUA_USE_ASSERT ON CACHE BOOL
         "Assertions for the whole LuaJIT VM" FORCE)
 endif()
 
-- 
2.31.0



More information about the Tarantool-patches mailing list