Skip to content

Commit e228cd8

Browse files
[wasm][build] Recognize wasi-wasm32 as valid host
wasi-wasm32 support in build system was added in b1236e9 but we forgot to add it to the host for the case when we are building the standalone stdlib for the target.
1 parent 330af0b commit e228cd8

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,14 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "ANDROID")
10431043
set(SWIFT_PRIMARY_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
10441044
set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
10451045

1046+
elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WASI")
1047+
set(SWIFT_HOST_VARIANT "wasi" CACHE STRING
1048+
"Deployment OS for Swift host tools (the compiler) [wasi]")
1049+
1050+
configure_sdk_unix("WASI" "wasm32")
1051+
set(SWIFT_PRIMARY_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
1052+
set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
1053+
10461054
elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
10471055

10481056
set(SWIFT_HOST_VARIANT "macosx" CACHE STRING

utils/build-script-impl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ function verify_host_is_supported() {
481481
| watchsimulator-arm64 \
482482
| watchos-armv7k \
483483
| watchos-arm64_32 \
484+
| wasi-wasm32 \
484485
| android-armv7 \
485486
| android-aarch64 \
486487
| android-x86_64)

0 commit comments

Comments
 (0)