File tree Expand file tree Collapse file tree 2 files changed +8
-0
lines changed
Expand file tree Collapse file tree 2 files changed +8
-0
lines changed Original file line number Diff line number Diff line change 11set (SWIFT_PRIMARY_VARIANT_SDK WASI CACHE STRING "" )
22set (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
46set (SWIFT_SDKS WASI CACHE STRING "" )
57
@@ -17,6 +19,9 @@ set(SWIFTWASM_DISABLE_REFLECTION_TEST YES CACHE BOOL "")
1719set (SWIFT_BUILD_STATIC_STDLIB YES CACHE BOOL "" )
1820set (SWIFT_BUILD_DYNAMIC_STDLIB NO CACHE BOOL "" )
1921set (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
2227set (SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER YES CACHE BOOL "" )
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments