aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2020-05-16 17:47:32 +0200
committerTor Egge <Tor.Egge@broadpark.no>2020-05-16 17:47:32 +0200
commitac22e819f02bb2d60cf7e0a071aea77ba80f22a6 (patch)
tree0deaf194346dc49bc954c0aafcadd75f286d3449
parent5e4fac82b41b4ba09bd7593b9b2a0ade2b944ad4 (diff)
Disable vespamalloc when using a sanitizer (e.g. address sanitizer).
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 906a00ad843..044af8ff499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,8 +142,8 @@ add_subdirectory(vespaclient-java)
add_subdirectory(vespajlib)
add_subdirectory(vespalib)
add_subdirectory(vespalog)
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-else()
+if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
+ NOT DEFINED VESPA_USE_SANITIZER)
add_subdirectory(vespamalloc)
endif()
add_subdirectory(vsm)