From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Igor Munkin <imun@tarantool.org>,
Sergey Ostanevich <sergos@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions
Date: Wed, 2 Jun 2021 18:59:58 +0300 [thread overview]
Message-ID: <20210602155958.16322-1-skaplun@tarantool.org> (raw)
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
next reply other threads:[~2021-06-02 16:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 15:59 Sergey Kaplun via Tarantool-patches [this message]
2021-06-04 11:00 ` Sergey Ostanevich via Tarantool-patches
2021-06-10 16:40 ` Igor Munkin via Tarantool-patches
2021-06-11 7:52 ` Sergey Kaplun via Tarantool-patches
2021-06-12 12:32 ` Igor Munkin via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210602155958.16322-1-skaplun@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=imun@tarantool.org \
--cc=sergos@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox