From 268efdf6e6798babb48fd1d6cc91319274ec58f9 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Fri, 7 Mar 2025 23:18:15 +1000
Subject: [PATCH] feat: Use `CARGO_BUILD_TARGET` as fallback for `--target`
(#2075)
* feat: Use `CARGO_BUILD_TARGET` as fallback for `--target`
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
* Fix e2e-tests: Unset CARGO_BUILD_TARGET before running e2e-tests
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---------
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
crates/bin/src/args.rs | 3 ++-
justfile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/crates/bin/src/args.rs b/crates/bin/src/args.rs
index 5dc38677..b993ed72 100644
--- a/crates/bin/src/args.rs
+++ b/crates/bin/src/args.rs
@@ -88,7 +88,8 @@ pub struct Args {
help_heading = "Package selection",
alias = "target",
long,
- value_name = "TRIPLE"
+ value_name = "TRIPLE",
+ env = "CARGO_BUILD_TARGET"
)]
pub(crate) targets: Option<Vec<String>>,
diff --git a/justfile b/justfile
index 2e266f61..f4590818 100644
--- a/justfile
+++ b/justfile
@@ -207,7 +207,7 @@ get-binary outdir=".": (get-output output-filename outdir)
-chmod +x {{ outdir / output-filename }}
e2e-test file *arguments: (get-binary "e2e-tests")
- cd e2e-tests && env -u RUSTFLAGS bash {{file}}.sh {{output-filename}} {{arguments}}
+ cd e2e-tests && env -u RUSTFLAGS -u CARGO_BUILD_TARGET bash {{file}}.sh {{output-filename}} {{arguments}}
e2e-test-live: (e2e-test "live")
e2e-test-subcrate: (e2e-test "subcrate")