From 6cd107ffadb0b8a12f5fd56048ece69dd6056f00 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 12 Mar 2025 15:29:36 +0300 Subject: [PATCH] CI: build libcxxabi against system unwind library ... because that is what the MSan is built against, and mixing them clearly causes issues. --- .github/libcxx-setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/libcxx-setup.sh b/.github/libcxx-setup.sh index eacc9827..1bd972fb 100755 --- a/.github/libcxx-setup.sh +++ b/.github/libcxx-setup.sh @@ -19,8 +19,9 @@ cmake -DCMAKE_C_COMPILER=${CC} \ -DLIBCXX_ABI_UNSTABLE=OFF \ -DLLVM_USE_SANITIZER=${LIBCXX_SANITIZER} \ -DLLVM_BUILD_32_BITS=${BUILD_32_BITS} \ - -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi;libunwind' \ + -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \ + -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi' \ -G "Unix Makefiles" \ ../llvm-project/runtimes/ -make -j cxx cxxabi unwind +make -j cxx cxxabi cd ..