commit 9ab726c: [Minor] Disable jemalloc on sanitized builds

Vsevolod Stakhov vsevolod at highsecure.ru
Tue Nov 19 15:21:06 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-11-19 15:15:52 +0000
URL: https://github.com/rspamd/rspamd/commit/9ab726cd1d7a5b2d13fd076f300c68084b56713c (HEAD -> master)

[Minor] Disable jemalloc on sanitized builds

---
 CMakeLists.txt        | 2 +-
 cmake/Sanitizer.cmake | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49bc44742..39a177310 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 	ENDIF(NOT LUA_FOUND)
 ENDIF(ENABLE_LUAJIT MATCHES "ON")
 
-IF(ENABLE_JEMALLOC MATCHES "ON")
+IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
 	ProcessPackage(JEMALLOC LIBRARY jemalloc_pic jemalloc INCLUDE jemalloc.h INCLUDE_SUFFIXES include/jemalloc
 		ROOT ${JEMALLOC_ROOT_DIR})
 	SET(WITH_JEMALLOC "1")
diff --git a/cmake/Sanitizer.cmake b/cmake/Sanitizer.cmake
index 73d72da8d..fc96fec8e 100644
--- a/cmake/Sanitizer.cmake
+++ b/cmake/Sanitizer.cmake
@@ -11,6 +11,7 @@ endif ()
 if (SANITIZE)
     if (ENABLE_JEMALLOC MATCHES "ON")
         message (STATUS "Jemalloc support is useless in case of build with sanitizers")
+        set (ENABLE_JEMALLOC "OFF")
     endif ()
     if (SANITIZE STREQUAL "address")
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")


More information about the Commits mailing list