Skip to content

Commit 787dfaf

Browse files
committed
ci: Do not override -g -O1 set in MSAN_FLAGS
Additionally, setting the "Debug" build configuration ensures that `linux_debug_CPPFLAGS` from depends are passed to the main build system.
1 parent 26c460a commit 787dfaf

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

ci/test/00_setup_env_native_fuzz_with_msan.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20+
# Setting CMAKE_{C,CXX}_FLAGS_DEBUG flags to an empty string ensures that the flags set in MSAN_FLAGS remain unaltered.
2021
# _FORTIFY_SOURCE is not compatible with MSAN.
2122
export BITCOIN_CONFIG="\
23+
-DCMAKE_BUILD_TYPE=Debug \
24+
-DCMAKE_C_FLAGS_DEBUG='' \
25+
-DCMAKE_CXX_FLAGS_DEBUG='' \
2226
-DBUILD_FOR_FUZZING=ON \
2327
-DSANITIZERS=fuzzer,memory \
2428
-DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -U_FORTIFY_SOURCE' \

ci/test/00_setup_env_native_msan.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20+
# Setting CMAKE_{C,CXX}_FLAGS_DEBUG flags to an empty string ensures that the flags set in MSAN_FLAGS remain unaltered.
2021
# _FORTIFY_SOURCE is not compatible with MSAN.
21-
export BITCOIN_CONFIG="-DSANITIZERS=memory -DAPPEND_CPPFLAGS='-U_FORTIFY_SOURCE'"
22+
export BITCOIN_CONFIG="\
23+
-DCMAKE_BUILD_TYPE=Debug \
24+
-DCMAKE_C_FLAGS_DEBUG='' \
25+
-DCMAKE_CXX_FLAGS_DEBUG='' \
26+
-DSANITIZERS=memory \
27+
-DAPPEND_CPPFLAGS='-U_FORTIFY_SOURCE' \
28+
"
2229
export USE_MEMORY_SANITIZER="true"
2330
export RUN_FUNCTIONAL_TESTS="false"
2431
export CCACHE_MAXSIZE=250M

0 commit comments

Comments
 (0)