Rebuild rust

anuraaga · Jan 21, 2025 · 5b56811 · 5b56811
1 parent 57c9d41
commit 5b56811
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -98,13 +98,13 @@ build.examples.rust: examples/allocation/rust/testdata/greet.wasm imports/wasi_s
 
 # Normally, we build release because it is smaller. Testing dwarf requires the debug build.
 internal/testing/dwarftestdata/testdata/rust/main.wasm.xz:
-	cd $(@D) && cargo wasi build
+	cd $(@D) && cargo build --target wasm32-wasip1
 	mv $(@D)/target/wasm32-wasip1/debug/main.wasm $(@D)
 	cd $(@D) && xz -k -f ./main.wasm # Rust's DWARF section is huge, so compress it.
 
 # Builds rust using cargo normally, or cargo-wasi.
 %.wasm: %.rs
-	@(cd $(@D); cargo $(if $(findstring wasi,$(cargo_target)),wasi build,build --target $(cargo_target)) --release)
+	@(cd $(@D); cargo build --target $(cargo_target) --release)
 	@mv $(@D)/target/$(cargo_target)/release/$(@F) $(@D)
 
 spectest_base_dir := internal/integration_test/spectest

diff --git a/examples/allocation/rust/testdata/greet.wasm b/examples/allocation/rust/testdata/greet.wasm
diff --git a/imports/wasi_snapshot_preview1/example/testdata/cargo-wasi/cat.wasm b/imports/wasi_snapshot_preview1/example/testdata/cargo-wasi/cat.wasm
diff --git a/imports/wasi_snapshot_preview1/testdata/cargo-wasi/wasi.wasm b/imports/wasi_snapshot_preview1/testdata/cargo-wasi/wasi.wasm
diff --git a/internal/testing/dwarftestdata/testdata/rust/main.wasm.xz b/internal/testing/dwarftestdata/testdata/rust/main.wasm.xz