Skip to content

Commit 1536e19

Browse files
Merge pull request #2127 from swiftwasm/maxd/5.3-update-wasi-sdk
Use WASI SDK 0.2.2-swiftwasm to fix setjmp headers in 5.3 branch
2 parents 6ba2613 + f79f742 commit 1536e19

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

utils/webassembly/install-wasi-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SOURCE_PATH="$( cd "$(dirname $0)/../../../" && pwd )"
66

77
cd $SOURCE_PATH
88

9-
WASI_SDK_URL="https://github.com/swiftwasm/wasi-sdk/releases/download/0.2.0-swiftwasm/dist-$2-latest.tgz.zip"
9+
WASI_SDK_URL="https://github.com/swiftwasm/wasi-sdk/releases/download/0.2.2-swiftwasm/dist-$2.zip"
1010

1111
[ ! -e dist-wasi-sdk.tgz.zip ] && \
1212
wget -O dist-wasi-sdk.tgz.zip $WASI_SDK_URL

utils/webassembly/linux/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353

5454
cmake --version
5555

56-
$SWIFT_PATH/utils/webassembly/install-wasi-sdk.sh linux ubuntu
56+
$SWIFT_PATH/utils/webassembly/install-wasi-sdk.sh linux ubuntu-18.04
5757

5858
# Link wasm32-wasi-unknown to wasm32-wasi because clang finds crt1.o from sysroot
5959
# with os and environment name `getMultiarchTriple`.
@@ -66,4 +66,4 @@ if [ -z $(which sccache) ]; then
6666
wget -O - "https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz" | \
6767
sudo tar xz --strip-components 1
6868
sudo ln -sf /opt/sccache/sccache /usr/local/bin
69-
fi
69+
fi

utils/webassembly/macos/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cd $SWIFT_PATH
2222

2323
cd $SOURCE_PATH
2424

25-
$SWIFT_PATH/utils/webassembly/install-wasi-sdk.sh macos macos
25+
$SWIFT_PATH/utils/webassembly/install-wasi-sdk.sh macos macos-10.15
2626

2727
# Link sysroot/usr/include to sysroot/include because Darwin sysroot doesn't
2828
# find header files in sysroot/include but sysroot/usr/include

0 commit comments

Comments
 (0)