Skip to content

Commit a93cb74

Browse files
committed
[sanitizer] Change LIBCXXABI_USE_LLVM_UNWINDER setup
1 parent 0e41ce6 commit a93cb74

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ function build_stage2 {
249249
ccache -z || true
250250

251251
local fno_sanitize_flag=
252+
local cmake_options="-DLIBCXXABI_USE_LLVM_UNWINDER=OFF"
252253

253254
if [ "$sanitizer_name" == "msan" ]; then
254255
export MSAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
@@ -297,10 +298,10 @@ function build_stage2 {
297298
(cd ${libcxx_build_dir} && \
298299
cmake \
299300
${cmake_stage2_common_options} \
301+
${cmake_options} \
300302
-DCMAKE_INSTALL_PREFIX="${ROOT}/${libcxx_install_dir}" \
301303
-DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi;libunwind' \
302304
-DLIBCXX_TEST_PARAMS='long_tests=False' \
303-
-DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
304305
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
305306
-DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
306307
-DCMAKE_C_FLAGS="${fsanitize_flag} ${cmake_libcxx_cflags} ${fno_sanitize_flag}" \

0 commit comments

Comments
 (0)