Skip to content

Commit 62d58c4

Browse files
committed
Bug 1875002 - Explicitly set LIBCXXABI_USE_LLVM_UNWINDER off when building wasi-sdk. r=firefox-build-system-reviewers,sergesanspaille
Clang trunk has recently turned it on, and also now fails the build when libunwind is not built at the same time. Upstreamed in WebAssembly/wasi-sdk#377 Differential Revision: https://phabricator.services.mozilla.com/D198763
1 parent d4d4343 commit 62d58c4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

taskcluster/scripts/misc/wasi-sdk.patch

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
diff --git a/Makefile b/Makefile
2+
index d2ccff6..95f395b 100644
3+
--- a/Makefile
4+
+++ b/Makefile
5+
@@ -178,6 +178,7 @@ LIBCXX_CMAKE_FLAGS = \
6+
-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
7+
-DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
8+
-DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
9+
+ -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
10+
-DWASI_SDK_PREFIX=$(BUILD_PREFIX) \
11+
-DUNIX:BOOL=ON \
12+
--debug-trycompile
113
diff --git a/src/wasi-libc/Makefile b/src/wasi-libc/Makefile
214
index f350ecb..9a5c940 100644
315
--- a/src/wasi-libc/Makefile

0 commit comments

Comments
 (0)