Skip to content

Use WASI SDK 0.2.2-swiftwasm to fix setjmp headers in 5.3 branch #2127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2020
Merged

Use WASI SDK 0.2.2-swiftwasm to fix setjmp headers in 5.3 branch #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58521b
Use WASI SDK 0.2.2-swiftwasm to fix setjmp headers in 5.3 branch
MaxDesiatov Oct 29, 2020
6df2ae0
Download ubuntu-18.04 WASI SDK distribution for Linux builds
MaxDesiatov Oct 29, 2020
f79f742
Pass `macos-10.15` argument to `install-wasi-sdk.sh`
MaxDesiatov Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/webassembly/install-wasi-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SOURCE_PATH="$( cd "$(dirname $0)/../../../" && pwd )"

cd $SOURCE_PATH

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

[ ! -e dist-wasi-sdk.tgz.zip ] && \
wget -O dist-wasi-sdk.tgz.zip $WASI_SDK_URL
Expand Down
4 changes: 2 additions & 2 deletions utils/webassembly/linux/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fi

cmake --version

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

# Link wasm32-wasi-unknown to wasm32-wasi because clang finds crt1.o from sysroot
# with os and environment name `getMultiarchTriple`.
Expand All @@ -66,4 +66,4 @@ if [ -z $(which sccache) ]; then
wget -O - "https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz" | \
sudo tar xz --strip-components 1
sudo ln -sf /opt/sccache/sccache /usr/local/bin
fi
fi
2 changes: 1 addition & 1 deletion utils/webassembly/macos/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd $SWIFT_PATH

cd $SOURCE_PATH

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

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