build: Introduce SANITIZER_CXXFLAGS variable

hebasto · Sep 2, 2024 · 13fd8fe · 13fd8fe
1 parent 50655d6
commit 13fd8fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -388,11 +388,15 @@ if(SANITIZERS)
     message(FATAL_ERROR "Linker did not accept requested flags, you are missing required libraries.")
   endif()
 endif()
+set(sanitizer_cxxflags_as_string "${SANITIZER_CXXFLAGS}")
+separate_arguments(SANITIZER_CXXFLAGS)
+target_compile_options(sanitize_interface INTERFACE ${SANITIZER_CXXFLAGS})
+target_link_options(sanitize_interface INTERFACE ${SANITIZER_CXXFLAGS})
 target_link_options(sanitize_interface INTERFACE ${SANITIZER_LDFLAGS})
 
 if(BUILD_FUZZ_BINARY)
   include(CheckSourceCompilesAndLinks)
-  check_cxx_source_links_with_flags("${SANITIZER_LDFLAGS}" "
+  check_cxx_source_links_with_flags("${sanitizer_cxxflags_as_string} ${SANITIZER_LDFLAGS}" "
       #include <cstdint>
       #include <cstddef>
       extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { return 0; }

diff --git a/ci/test/00_setup_env_native_fuzz_with_msan.sh b/ci/test/00_setup_env_native_fuzz_with_msan.sh
@@ -23,6 +23,8 @@ export BITCOIN_CONFIG="\
  -DCMAKE_BUILD_TYPE=Debug \
  -DCMAKE_C_FLAGS_DEBUG='' \
  -DCMAKE_CXX_FLAGS_DEBUG='' \
+ -DCMAKE_CXX_FLAGS='' \
+ -DSANITIZER_CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}' \
  -DBUILD_FOR_FUZZING=ON \
  -DSANITIZERS=fuzzer,memory \
  -DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -U_FORTIFY_SOURCE' \