Skip to content

Commit ef49678

Browse files
[WASM] Remove swift_static workarounds
Driver users should provide -static-executable or -static-stdlib to load module from swift_static. These options tell the frontend -use-static-resource-dir which enables to include swift_static dir
1 parent 9a925f5 commit ef49678

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

utils/webassembly/build-foundation.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ cmake -G Ninja \
2020

2121
ninja -v
2222
ninja -v install
23-
24-
# .swiftdoc and .swiftmodule files should live in `swift`, not in `swift_static`
25-
mv $DESTINATION_TOOLCHAIN/usr/lib/swift_static/wasi/wasm32/Foundation.swift* \
26-
$DESTINATION_TOOLCHAIN/usr/lib/swift/wasi/wasm32

utils/webassembly/build-xctest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake -G Ninja \
1515
-DWASI_SDK_PATH="$SOURCE_PATH/wasi-sdk" \
1616
-DBUILD_SHARED_LIBS=OFF \
1717
-DCMAKE_Swift_COMPILER_FORCED=ON \
18-
-DSWIFT_FOUNDATION_PATH=$DESTINATION_TOOLCHAIN/usr/lib/swift/wasi/wasm32 \
18+
-DSWIFT_FOUNDATION_PATH=$DESTINATION_TOOLCHAIN/usr/lib/swift_static/wasi/wasm32 \
1919
"${SOURCE_PATH}/swift-corelibs-xctest"
2020

2121
ninja -v

0 commit comments

Comments
 (0)