Changeset: 7e182f1aa11f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7e182f1aa11f
Modified Files:
cmake/monetdb-toolchain.cmake
monetdb_config.h.in
Branch: default
Log Message:
Move SANITIZER define into monetdb_config.h (instead of compiler command line).
diffs (31 lines):
diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake
--- a/cmake/monetdb-toolchain.cmake
+++ b/cmake/monetdb-toolchain.cmake
@@ -21,7 +21,6 @@ function(monetdb_default_compiler_option
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
add_compile_options("-fsanitize=address")
add_compile_options("-fno-omit-frame-pointer")
- add_compile_definitions(SANITIZER)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
add_link_options("-fsanitize=address")
else()
@@ -30,7 +29,6 @@ function(monetdb_default_compiler_option
elseif ("${CMAKE_C_COMPILER_ID}" MATCHES "^(Clang|AppleClang)$")
add_compile_options("-fsanitize=address")
add_compile_options("-fno-omit-frame-pointer")
- add_compile_definitions(SANITIZER)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
add_link_options("-fsanitize=address")
else()
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -209,6 +209,8 @@
#cmakedefine WITH_TCMALLOC 1
#cmakedefine WITH_MALLOC "@WITH_MALLOC@"
+#cmakedefine SANITIZER 1
+
#define BUILD_TYPE "@BUILD_TYPE@"
#define EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
