Merge branch 'james/mainline/wasm-cargo-target-dir' (#337)

* james/mainline/wasm-cargo-target-dir: changelog: add #337 Specify --target-dir when building wasms
anoma · Aug 22, 2022 · d1a8608 · d1a8608
2 parents c4cca9d + 476be48
commit d1a8608
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.changelog/unreleased/improvements/337-wasm-cargo-target-dir.md b/.changelog/unreleased/improvements/337-wasm-cargo-target-dir.md
@@ -0,0 +1,2 @@
+- Handles the case where a custom `$CARGO_TARGET_DIR` is set during WASM build
+  ([#337](https://github.com/anoma/anoma/pull/337))
diff --git a/wasm/wasm_source/Makefile b/wasm/wasm_source/Makefile
@@ -54,12 +54,12 @@ fmt-check:
 # Build a selected wasm
 # Linker flag "-s" for stripping (https://github.com/rust-lang/cargo/issues/3483#issuecomment-431209957)
 $(wasms): %:
-	RUSTFLAGS='-C link-arg=-s' $(cargo) build --release --target wasm32-unknown-unknown --features $@ && \
-	cp "../target/wasm32-unknown-unknown/release/namada_wasm.wasm" ../$@.wasm
+	RUSTFLAGS='-C link-arg=-s' $(cargo) build --release --target wasm32-unknown-unknown --target-dir 'target' --features $@ && \
+	cp "./target/wasm32-unknown-unknown/release/namada_wasm.wasm" ../$@.wasm
 
 # Build a selected wasm in debug mode
 $(patsubst %,debug_%,$(wasms)): debug_%:
-	RUSTFLAGS='-C link-arg=-s' $(cargo) build --target wasm32-unknown-unknown --features $* && \
+	RUSTFLAGS='-C link-arg=-s' $(cargo) build --target wasm32-unknown-unknown --target-dir 'target' --features $* && \
 	cp "../target/wasm32-unknown-unknown/debug/anoma_wasm.wasm" ../$*.wasm
 
 # `cargo check` one of the wasms, e.g. `make check_tx_transfer`

diff --git a/wasm_for_tests/wasm_source/Makefile b/wasm_for_tests/wasm_source/Makefile
@@ -46,7 +46,7 @@ fmt-check:
 
 # Build a selected wasm
 $(wasms): %:
-	$(cargo) build --release --target wasm32-unknown-unknown --features $@ && \
+	$(cargo) build --release --target wasm32-unknown-unknown --target-dir 'target' --features $@ && \
 	cp "./target/wasm32-unknown-unknown/release/namada_wasm_for_tests.wasm" ../$@.wasm
 
 # `cargo check` one of the wasms, e.g. `make check_tx_no_op`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Handles the case where a custom `$CARGO_TARGET_DIR` is set during WASM build
		([#337](https://github.com/anoma/anoma/pull/337))