diff options
| author | Tor Brede Vekterli <vekterli@vespa.ai> | 2024-01-05 12:18:27 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@vespa.ai> | 2024-01-05 12:23:52 +0000 |
| commit | 24e353231d06cec523374a7e6d5edccdafc3d5a5 (patch) | |
| tree | 0d3b19a24985f32af1f1fa60679172b4727f3703 /defaults | |
| parent | 8aca398fac2aaa8301d0d109466bd2a46c8013bf (diff) | |
Allow for combining ASan and UBsan instrumentation in same build
With this change `VESPA_USE_SANITIZER` can be set to `address,undefined`.
This is a combination that is compiler-supported, and which allows
us to reduce the number of distinct sanitized builds on factory down
to just 2 (ASan+UBSan and TSan).
Diffstat (limited to 'defaults')
| -rw-r--r-- | defaults/src/vespa/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/defaults/src/vespa/CMakeLists.txt b/defaults/src/vespa/CMakeLists.txt index c2bf0de5b6b..e2bfbf3264b 100644 --- a/defaults/src/vespa/CMakeLists.txt +++ b/defaults/src/vespa/CMakeLists.txt @@ -12,11 +12,13 @@ function(vespa_configure_config_h) set(VESPA_USE_UNDEFINED_SANITIZER False) set(VESPA_HAS_IO_URING False) set(VESPA_HAS_EPOLL False) - if(VESPA_USE_SANITIZER STREQUAL "address") + if(VESPA_USE_SANITIZER MATCHES "address") set(VESPA_USE_ADDRESS_SANITIZER True) - elseif(VESPA_USE_SANITIZER STREQUAL "thread") + endif() + if(VESPA_USE_SANITIZER STREQUAL "thread") set(VESPA_USE_THREAD_SANITIZER True) - elseif(VESPA_USE_SANITIZER STREQUAL "undefined") + endif() + if(VESPA_USE_SANITIZER MATCHES "undefined") set(VESPA_USE_UNDEFINED_SANITIZER True) endif() if(NOT APPLE) |