Skip to content
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

chore: update rust and wasi toolchain #7212

Merged
merged 11 commits into from
Nov 12, 2024
Merged

chore: update rust and wasi toolchain #7212

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bcf5247
init
Pushkarm029 Oct 31, 2024
326d84d
fix
Pushkarm029 Oct 31, 2024
cb63058
fix
Pushkarm029 Nov 6, 2024
8a5d267
fix
Pushkarm029 Nov 6, 2024
d6b03a8
lint
Pushkarm029 Nov 6, 2024
3344496
fix
Pushkarm029 Nov 6, 2024
67e0a5a
Merge branch 'main' into update_rust_wasm
monadabot Nov 6, 2024
9d4fe0a
chore: self mutation (build.diff)
monadabot Nov 6, 2024
d8035b8
Update .cargo/config.toml
Pushkarm029 Nov 6, 2024
757eff2
fix
Pushkarm029 Nov 7, 2024
d742cec
Merge branch 'main' of github.com:winglang/wing into update_rust_wasm
Pushkarm029 Nov 11, 2024
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
4 changes: 2 additions & 2 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[env]
# tree-sitter build fails with newer version of clang unless implicit-function-declaration is ignored
CC_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/clang -Wno-error=implicit-function-declaration", relative = true }
AR_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/ar", relative = true }
CC_wasm32_wasi = { value = ".cargo/wasi-sdk-24.0/bin/clang -Wno-error=implicit-function-declaration", relative = true }
Pushkarm029 marked this conversation as resolved.
Show resolved Hide resolved
AR_wasm32_wasi = { value = ".cargo/wasi-sdk-24.0/bin/ar", relative = true }
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
profile = "default"
channel = "1.77.2"
channel = "1.82.0"
targets = ["wasm32-wasi"]
6 changes: 3 additions & 3 deletions scripts/setup_wasi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -eo pipefail

TOOL_INSTALL_DIR="./.cargo"

BINARYEN_VERSION="version_117"
WASI_SDK_VERSION="21"
BINARYEN_VERSION="version_119"
WASI_SDK_VERSION="24"
WASI_SDK_VERSION_FULL="$WASI_SDK_VERSION.0"

SYS_OS=$OSTYPE
Expand Down Expand Up @@ -54,7 +54,7 @@ fi
# Download wasi-sdk
WASI_SDK_INSTALL_DIR="$TOOL_INSTALL_DIR/wasi-sdk-$WASI_SDK_VERSION_FULL"
if [ ! -d $WASI_SDK_INSTALL_DIR ]; then
WASI_SDK_TARBALL="wasi-sdk-$WASI_SDK_VERSION_FULL-$SYS_OS.tar.gz"
WASI_SDK_TARBALL="wasi-sdk-$WASI_SDK_VERSION_FULL-x86_64-$SYS_OS.tar.gz"
Pushkarm029 marked this conversation as resolved.
Show resolved Hide resolved
WASI_SDK_INSTALL_URL="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_SDK_VERSION/$WASI_SDK_TARBALL"
OUTFILE="/tmp/$WASI_SDK_TARBALL"
Pushkarm029 marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
Loading