From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 19 Nov 2019 12:19:32 +0000 (+0000)
Subject: [Minor] Try to fix gcc sanitizers
X-Git-Tag: 2.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbd2c0e1e3da12793dbf2681feac1244e9ae5485;p=thirdparty%2Frspamd.git

[Minor] Try to fix gcc sanitizers
---

diff --git a/cmake/Sanitizer.cmake b/cmake/Sanitizer.cmake
index 34ef288a72..73d72da8d2 100644
--- a/cmake/Sanitizer.cmake
+++ b/cmake/Sanitizer.cmake
@@ -16,6 +16,8 @@ if (SANITIZE)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
         if (COMPILER_GCC)
+            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libasan")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libasan")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan")
         endif ()
@@ -27,6 +29,8 @@ if (SANITIZE)
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
 
         if (COMPILER_GCC)
+            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libmsan")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libmsan")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libmsan")
         endif ()
@@ -34,10 +38,10 @@ if (SANITIZE)
     elseif (SANITIZE STREQUAL "undefined")
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if (COMPILER_GCC)
+            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libubsan")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libubsan")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
-        endif()
-        if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
             set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libubsan")
         endif ()