From 49ab7c1cb2e1924ea2aee4fd24010744b872f2d5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 19 Jan 2024 14:58:47 +0100 Subject: [PATCH] Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds --- debian/changelog | 1 + debian/rules | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ceb210c1..152a2b8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:18~++20231211102647+75193b192ad9-1~exp2) experimental * For the usage of -DLIBCXXABI_USE_LLVM_UNWINDER=OFF when we don't build unwind https://github.com/llvm/llvm-project/issues/77846 * remove the unconditionnaly defined -DLIBUNWIND_USE_COMPILER_RT=ON + * Also pass -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF to libcxx-wasm32-wasi builds -- Sylvestre Ledru Fri, 12 Jan 2024 18:33:31 +0100 diff --git a/debian/rules b/debian/rules index 9b819c18..7b1f3f94 100755 --- a/debian/rules +++ b/debian/rules @@ -1006,7 +1006,8 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-% -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \ -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \ -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \ - -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF + -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \ + -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF ninja -C "$@" -j $(NJOBS) $(VERBOSE) endif