Skip to content

Commit 672386c

Browse files
authored
Merge pull request #70629 from apple/maxd/embedded-wasm
stdlib/public/CMakeLists.txt: Enable embedded Wasm
2 parents 4e8c1ef + 22c42e1 commit 672386c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

cmake/modules/SwiftSetIfArchBitness.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ function(set_if_arch_bitness var_name)
3131
"${SIA_ARCH}" STREQUAL "powerpc64" OR
3232
"${SIA_ARCH}" STREQUAL "powerpc64le" OR
3333
"${SIA_ARCH}" STREQUAL "s390x" OR
34-
"${SIA_ARCH}" STREQUAL "riscv64")
34+
"${SIA_ARCH}" STREQUAL "riscv64" OR
35+
"${SIA_ARCH}" STREQUAL "wasm64")
3536
set("${var_name}" "${SIA_CASE_64_BIT}" PARENT_SCOPE)
3637
else()
3738
message(FATAL_ERROR "Unknown architecture: ${SIA_ARCH}")

stdlib/public/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,13 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
191191
)
192192
endif()
193193

194+
if("WebAssembly" IN_LIST LLVM_TARGETS_TO_BUILD)
195+
list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
196+
"wasm32 wasm32-unknown-none-wasm wasm32-unknown-none-wasm"
197+
"wasm64 wasm64-unknown-none-wasm wasm64-unknown-none-wasm"
198+
)
199+
endif()
200+
194201
if (SWIFT_HOST_VARIANT STREQUAL "linux")
195202
set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
196203
"${SWIFT_HOST_VARIANT_ARCH} ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu"

0 commit comments

Comments
 (0)