From 8fec4d53d0f6db0847050bf2a608141bbd98e768 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 22 Jan 2017 04:21:27 +0300
Subject: ci: Make ASAN build link with lua, build lua with address sanitizer

---
 third-party/cmake/BuildLua.cmake | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'third-party/cmake/BuildLua.cmake')

diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake
index 1c5e2a186c..ed300710d1 100644
--- a/third-party/cmake/BuildLua.cmake
+++ b/third-party/cmake/BuildLua.cmake
@@ -51,19 +51,32 @@ else()
   endif()
 endif()
 
+set(LUA_CFLAGS "-g3")
+set(LUA_LDFLAGS "")
+
+if(CLANG_ASAN_UBSAN)
+  set(LUA_CFLAGS "${LUA_CFLAGS} -fsanitize=address")
+  set(LUA_CFLAGS "${LUA_CFLAGS} -fno-omit-frame-pointer")
+  set(LUA_CFLAGS "${LUA_CFLAGS} -fno-optimize-sibling-calls")
+
+  set(LUA_LDFLAGS "${LUA_LDFLAGS} -fsanitize=address")
+endif()
+
 set(LUA_CONFIGURE_COMMAND
   sed -e "/^CC/s@gcc@${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}@"
-      -e "/^CFLAGS/s@-O2@-g3@"
+      -e "/^CFLAGS/s@-O2@${LUA_CFLAGS}@"
+      -e "/^MYLDFLAGS/s@$@${LUA_LDFLAGS}@"
       -e "s@-lreadline@@g"
       -e "s@-lhistory@@g"
       -e "s@-lncurses@@g"
       -i ${DEPS_BUILD_DIR}/src/lua/src/Makefile &&
   sed -e "/#define LUA_USE_READLINE/d"
       -i ${DEPS_BUILD_DIR}/src/lua/src/luaconf.h)
+set(LUA_INSTALL_TOP_ARG "INSTALL_TOP=${DEPS_INSTALL_DIR}")
 set(LUA_BUILD_COMMAND
-  ${MAKE_PRG} ${LUA_TARGET})
+    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} ${LUA_TARGET})
 set(LUA_INSTALL_COMMAND
-  ${MAKE_PRG} INSTALL_TOP=${DEPS_INSTALL_DIR} install)
+    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} install)
 
 message(STATUS "Lua target is ${LUA_TARGET}")
 
-- 
cgit 


From c5a2124e81b87334237916bd087c5c412862d6f2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 22 Jan 2017 06:10:52 +0300
Subject: ci: When building lua use -fPIC

---
 third-party/cmake/BuildLua.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'third-party/cmake/BuildLua.cmake')

diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake
index ed300710d1..d0566f6df8 100644
--- a/third-party/cmake/BuildLua.cmake
+++ b/third-party/cmake/BuildLua.cmake
@@ -58,6 +58,7 @@ if(CLANG_ASAN_UBSAN)
   set(LUA_CFLAGS "${LUA_CFLAGS} -fsanitize=address")
   set(LUA_CFLAGS "${LUA_CFLAGS} -fno-omit-frame-pointer")
   set(LUA_CFLAGS "${LUA_CFLAGS} -fno-optimize-sibling-calls")
+  set(LUA_CFLAGS "${LUA_CFLAGS} -fPIC")
 
   set(LUA_LDFLAGS "${LUA_LDFLAGS} -fsanitize=address")
 endif()
-- 
cgit 


From d5228787ce62c37291018a7b0215e07ebf26946d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 23 Jan 2017 01:30:47 +0300
Subject: deps: Always build lua with -fPIC and -O0

---
 third-party/cmake/BuildLua.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'third-party/cmake/BuildLua.cmake')

diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake
index d0566f6df8..ea1371d1d5 100644
--- a/third-party/cmake/BuildLua.cmake
+++ b/third-party/cmake/BuildLua.cmake
@@ -51,14 +51,13 @@ else()
   endif()
 endif()
 
-set(LUA_CFLAGS "-g3")
+set(LUA_CFLAGS "-O0 -g3 -fPIC")
 set(LUA_LDFLAGS "")
 
 if(CLANG_ASAN_UBSAN)
   set(LUA_CFLAGS "${LUA_CFLAGS} -fsanitize=address")
   set(LUA_CFLAGS "${LUA_CFLAGS} -fno-omit-frame-pointer")
   set(LUA_CFLAGS "${LUA_CFLAGS} -fno-optimize-sibling-calls")
-  set(LUA_CFLAGS "${LUA_CFLAGS} -fPIC")
 
   set(LUA_LDFLAGS "${LUA_LDFLAGS} -fsanitize=address")
 endif()
-- 
cgit