From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 388FB6EC40; Wed, 2 Jun 2021 19:01:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 388FB6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622649671; bh=6tRtUPCOII3BOUN9J6UAIpnWOPf2kUR+zFowe9TeyOA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=MDJrTfCBLMKmmpijipNHnyv5ZvCb6C8I8Bp6gchUUZk0DE0PD5k0bnw9zjPLzj79y /fXyydpwahB79cvONK85bRKs/CTQkSdTUhohsgE+NVTRkhSsY/FsFI4pPYLBkbU2l4 IIzMry21edoYvkWManEZ5fXsNtaBM5phSqoSx6yk= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id AD9A86EC40 for ; Wed, 2 Jun 2021 19:01:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AD9A86EC40 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1loTIr-0004gW-CW; Wed, 02 Jun 2021 19:01:09 +0300 To: Igor Munkin , Sergey Ostanevich Date: Wed, 2 Jun 2021 18:59:58 +0300 Message-Id: <20210602155958.16322-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C543EF5F9E25E4001B3518B676B8BE4A4C7182A05F538085040C298BC6A0E04A711174E08650A5FCBC4C17751B3B5DB1036D6936F2A14CFC32A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C2204D4F9A221771EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006376CE4E8B6A85920B98638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8470D39470999B00FB10CEDD99DB68465117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B67393CE827C55B5F775ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CDBB9428EB2128D67F553393BBBCA6BFEE39A01EE5722DAE29C2B6934AE262D3EE7EAB7254005DCED97E92A89321C69D71E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0FEFB8A20A2F5DA258E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344A431191C56981FE79A021D9C37FEA59238CFA0EFF1994D8A82AE26250BF3240B0D7C08971EDE17C1D7E09C32AA3244CAE5C3441E3D54EB7AE679E5436002AF8E646F07CC2D4F3D8927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj+mfSpkNmA2oMkw+nM2Elew== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822386E07BD962323F3D1ED80D273E0AA020FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED567EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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