From 7d7762d340f635a3511311072e073948d1622e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 1 Jul 2024 16:23:49 +0200 Subject: [PATCH 1/3] fix(examples/wasmtime): use parent cargo binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- examples/wasmtime/build.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/wasmtime/build.rs b/examples/wasmtime/build.rs index f268274f0..d4a602e93 100644 --- a/examples/wasmtime/build.rs +++ b/examples/wasmtime/build.rs @@ -2,9 +2,10 @@ use std::process::Command; use std::{env, io}; fn main() -> io::Result<()> { + let cargo = env::var_os("CARGO").unwrap(); let out_dir = env::var_os("OUT_DIR").unwrap(); - let status = Command::new("cargo") + let status = Command::new(cargo) .arg("build") .arg("-Zunstable-options") .arg("-Zbuild-std=std,panic_abort") From 8128bd73ddc34d821189896e76a1c48cd6618a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 1 Jul 2024 16:24:42 +0200 Subject: [PATCH 2/3] fix(examples/wasmtime): rename `--out-dir` to `--artifact-dir` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- examples/wasmtime/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wasmtime/build.rs b/examples/wasmtime/build.rs index d4a602e93..63fabfde0 100644 --- a/examples/wasmtime/build.rs +++ b/examples/wasmtime/build.rs @@ -12,7 +12,7 @@ fn main() -> io::Result<()> { .arg("--target=wasm32-unknown-unknown") .arg("--package=fibonacci") .arg("--release") - .arg("--out-dir") + .arg("--artifact-dir") .arg(&out_dir) .status()?; assert!(status.success()); From 054f5cb081ad924a1fc3ee486927d5cfcbc42b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 1 Jul 2024 16:25:42 +0200 Subject: [PATCH 3/3] fix(examples/wasmtime): use separate target directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- examples/wasmtime/.gitignore | 1 + examples/wasmtime/build.rs | 1 + 2 files changed, 2 insertions(+) create mode 100644 examples/wasmtime/.gitignore diff --git a/examples/wasmtime/.gitignore b/examples/wasmtime/.gitignore new file mode 100644 index 000000000..ea8c4bf7f --- /dev/null +++ b/examples/wasmtime/.gitignore @@ -0,0 +1 @@ +/target diff --git a/examples/wasmtime/build.rs b/examples/wasmtime/build.rs index 63fabfde0..6aad0bac3 100644 --- a/examples/wasmtime/build.rs +++ b/examples/wasmtime/build.rs @@ -12,6 +12,7 @@ fn main() -> io::Result<()> { .arg("--target=wasm32-unknown-unknown") .arg("--package=fibonacci") .arg("--release") + .arg("--target-dir=target") .arg("--artifact-dir") .arg(&out_dir) .status()?;