Skip to content

Commit 4513de2

Browse files
[WASM] Fix building on Linux
1 parent 6d8114c commit 4513de2

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

cmake/caches/Runtime-WASI-wasm32.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(SWIFT_PRIMARY_VARIANT_SDK WASI CACHE STRING "")
22
set(SWIFT_PRIMARY_VARIANT_ARCH wasm32 CACHE STRING "")
3+
set(SWIFT_HOST_VARIANT_SDK NONE CACHE STRING "")
4+
set(SWIFT_HOST_VARIANT_ARCH NONE CACHE STRING "")
35

46
set(SWIFT_SDKS WASI CACHE STRING "")
57

@@ -17,6 +19,9 @@ set(SWIFTWASM_DISABLE_REFLECTION_TEST YES CACHE BOOL "")
1719
set(SWIFT_BUILD_STATIC_STDLIB YES CACHE BOOL "")
1820
set(SWIFT_BUILD_DYNAMIC_STDLIB NO CACHE BOOL "")
1921
set(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY NO CACHE BOOL "")
22+
# TODO(katei): This should get turned off, as this is not an ABI stable platform.
23+
# But current CMake build system doesn't support SWIFT_STDLIB_STABLE_ABI=NO
24+
set(SWIFT_STDLIB_STABLE_ABI YES CACHE BOOL "")
2025

2126
# build with the host compiler
2227
set(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER YES CACHE BOOL "")

utils/webassembly/build-toolchain.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ build_target_toolchain() {
113113
mkdir -p "$SWIFT_STDLIB_BUILD_DIR/lib/clang/10.0.0/"
114114
ln -fs "$COMPILER_RT_BUILD_DIR/lib" "$SWIFT_STDLIB_BUILD_DIR/lib/clang/10.0.0/lib"
115115

116+
# Remove host CoreFoundation module directory to avoid module conflict
117+
# while building Foundation
118+
rm -rf "$DIST_TOOLCHAIN_SDK/usr/lib/swift_static/CoreFoundation"
116119
"$UTILS_PATH/build-foundation.sh" "$DIST_TOOLCHAIN_SDK"
117120
"$UTILS_PATH/build-xctest.sh" "$DIST_TOOLCHAIN_SDK"
118121

0 commit comments

Comments
 (0)