From ac22e819f02bb2d60cf7e0a071aea77ba80f22a6 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Sat, 16 May 2020 17:47:32 +0200
Subject: Disable vespamalloc when using a sanitizer (e.g. address sanitizer).

---
 CMakeLists.txt | 4 ++--
 1 file 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)
-- 
cgit v1.2.3