Skip to content

Commit 5528b40

Browse files
Merge pull request #66534 from kateinoigakukun/pr-a7645923603fc716c8f3b55bfd113d3972dc3bb6
[wasm][build] Recognize wasi-wasm32 as valid host
2 parents 2a78957 + e228cd8 commit 5528b40

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
@@ -483,6 +483,7 @@ function verify_host_is_supported() {
483483
| watchsimulator-arm64 \
484484
| watchos-armv7k \
485485
| watchos-arm64_32 \
486+
| wasi-wasm32 \
486487
| android-armv7 \
487488
| android-aarch64 \
488489
| android-x86_64)

0 commit comments

Comments
 (0)