diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | dist/vespa.spec | 7 | ||||
| -rw-r--r-- | vespamalloc/CMakeLists.txt | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 863ce8dd9de..12b5a615beb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,10 +149,7 @@ add_subdirectory(vespaclient-java) add_subdirectory(vespajlib) add_subdirectory(vespalib) add_subdirectory(vespalog) -if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND - NOT DEFINED VESPA_USE_SANITIZER) - add_subdirectory(vespamalloc) -endif() +add_subdirectory(vespamalloc) add_subdirectory(vsm) add_subdirectory(zkfacade) add_subdirectory(zookeeper-command-line-client) diff --git a/dist/vespa.spec b/dist/vespa.spec index acd9c30956e..f50beba18a3 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -51,6 +51,7 @@ BuildRequires: maven BuildRequires: python3-pytest %else BuildRequires: devtoolset-11-gcc-c++ +BuildRequires: devtoolset-11-libasan-devel BuildRequires: devtoolset-11-libatomic-devel BuildRequires: devtoolset-11-binutils BuildRequires: rh-maven35 @@ -66,11 +67,13 @@ BuildRequires: python3-devel %if 0%{?_centos_stream} BuildRequires: gcc-toolset-11-gcc-c++ BuildRequires: gcc-toolset-11-binutils +BuildRequires: gcc-toolset-11-libasan-devel BuildRequires: gcc-toolset-11-libatomic-devel %define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %else BuildRequires: gcc-toolset-11-gcc-c++ BuildRequires: gcc-toolset-11-binutils +BuildRequires: gcc-toolset-11-libasan-devel BuildRequires: gcc-toolset-11-libatomic-devel %define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %endif @@ -82,6 +85,8 @@ BuildRequires: glibc-langpack-en %endif %if 0%{?el9} BuildRequires: gcc-c++ +BuildRequires: libasan +BuildRequires: libasan-static BuildRequires: libatomic BuildRequires: vespa-pybind11-devel BuildRequires: python3-pytest @@ -90,6 +95,8 @@ BuildRequires: glibc-langpack-en %endif %if 0%{?fedora} BuildRequires: gcc-c++ +BuildRequires: libasan +BuildRequires: libasan-static BuildRequires: libatomic BuildRequires: pybind11-devel BuildRequires: python3-pytest diff --git a/vespamalloc/CMakeLists.txt b/vespamalloc/CMakeLists.txt index 395e7ec6d5a..df8e38653bb 100644 --- a/vespamalloc/CMakeLists.txt +++ b/vespamalloc/CMakeLists.txt @@ -1,4 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND + NOT DEFINED VESPA_USE_SANITIZER) add_compile_options(-fvisibility=hidden) add_definitions(-DPARANOID_LEVEL=0) @@ -25,4 +27,7 @@ vespa_define_module( ) vespa_install_script(bin/parsememorydump.pl vespa-malloc-parse-memorydump.pl bin) +else() +install(DIRECTORY DESTINATION lib64/vespa) +endif() install(FILES etc/vespamalloc.conf PERMISSIONS OWNER_READ GROUP_READ WORLD_READ DESTINATION etc) |