Skip to content

rust: Fix building of unit-wasm #31

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 1 commit into from
May 14, 2025
Merged

rust: Fix building of unit-wasm #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/build_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
steps:
- name: Install tools/deps
run: |
dnf -y install git wget clang llvm compiler-rt lld make wasi-libc-devel cargo rust rust-std-static-wasm32-unknown-unknown rust-std-static-wasm32-wasi
dnf -y install git wget clang llvm compiler-rt lld make wasi-libc-devel cargo rust rust-std-static-wasm32-wasip1
wget -O- https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz | tar --strip-components=1 -xvzf - -C $(dirname $(clang -print-runtime-dir))

- uses: actions/checkout@v3
Expand All @@ -55,7 +55,7 @@ jobs:
wget -O- https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz | tar --strip-components=1 -xvzf - -C $(dirname $(clang -print-runtime-dir))
curl https://sh.rustup.rs -sSf | sh -s -- -y
. "$HOME/.cargo/env"
rustup target add wasm32-wasi
rustup target add wasm32-wasip1
wget -O- https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz | tar -xzf - -C ${RUNNER_TEMP}

- uses: actions/checkout@v3
Expand Down
19 changes: 11 additions & 8 deletions examples/rust/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
include ../../shared.mk

TARGET = wasm32-wasip1
CARGO_CMD = cargo build --target=$(TARGET)

SDIR = examples/rust

examples: rust-echo-request \
Expand All @@ -8,20 +11,20 @@ examples: rust-echo-request \
rust-large-upload

rust-echo-request: echo-request/Cargo.toml echo-request/src/lib.rs
$(PP_GEN) $(SDIR)/echo-request/target/wasm32-wasi/
$(v)cd echo-request; cargo build --target=wasm32-wasi
$(PP_GEN) $(SDIR)/echo-request/target/$(TARGET)/
$(v)cd echo-request; $(CARGO_CMD)

rust-upload-reflector: upload-reflector/Cargo.toml upload-reflector/src/lib.rs
$(PP_GEN) $(SDIR)/upload-reflector/target/wasm32-wasi/
$(v)cd upload-reflector; cargo build --target=wasm32-wasi
$(PP_GEN) $(SDIR)/upload-reflector/target/$(TARGET)/
$(v)cd upload-reflector; $(CARGO_CMD)

rust-hello-world: hello-world/Cargo.toml hello-world/src/lib.rs
$(PP_GEN) $(SDIR)/hello-world/target/wasm32-wasi/
$(v)cd hello-world; cargo build --target=wasm32-wasi
$(PP_GEN) $(SDIR)/hello-world/target/$(TARGET)/
$(v)cd hello-world; $(CARGO_CMD)

rust-large-upload: large-upload/Cargo.toml large-upload/src/lib.rs
$(PP_GEN) $(SDIR)/large-upload/target/wasm32-wasi/
$(v)cd large-upload; cargo build --target=wasm32-wasi
$(PP_GEN) $(SDIR)/large-upload/target/$(TARGET)/
$(v)cd large-upload; $(CARGO_CMD)

clean:
rm -f */Cargo.lock
Expand Down
4 changes: 2 additions & 2 deletions src/rust/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ include ../../shared.mk
SDIR = src/rust

rustlib:
$(PP_GEN) $(SDIR)/target/wasm32-wasi
$(v)cargo build --target=wasm32-wasi
$(PP_GEN) $(SDIR)/target/wasm32-wasip1
$(v)cargo build --target=wasm32-wasip1

clean:
rm -f Cargo.lock unit-wasm-sys/Cargo.lock
Expand Down
2 changes: 1 addition & 1 deletion src/rust/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cargo add unit-wasm

## Prerequisites

- target add wasm32-wasi. `rustup target add wasm32-wasi`
- target add wasm32-wasip1. `rustup target add wasm32-wasip1`

## From Source

Expand Down