diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-16 08:00:18 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-16 09:02:16 +0000 |
| commit | 98c329c1e63124218d76f3cf7fe5105f81c7d4e1 (patch) | |
| tree | b7e301d26d450b8cd6cbbf735a5a712ce774898c | |
| parent | 0077017e233d2f666ccc281c54772d6f73fc686e (diff) | |
Enable vespamalloc for non x86_64 too.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | default_build_settings.cmake | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea469733695..863ce8dd9de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,8 +150,7 @@ add_subdirectory(vespajlib) add_subdirectory(vespalib) add_subdirectory(vespalog) if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND - NOT DEFINED VESPA_USE_SANITIZER AND - CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + NOT DEFINED VESPA_USE_SANITIZER) add_subdirectory(vespamalloc) endif() add_subdirectory(vsm) diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 36368cbce3e..233f76b7a96 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -236,6 +236,7 @@ function(vespa_use_default_build_settings) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${DEFAULT_CMAKE_SHARED_LINKER_FLAGS}" PARENT_SCOPE) endif() if(NOT DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) + message("-- CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(VESPA_OS_DISTRO STREQUAL "fedora" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell") |