Skip to content

Commit 5960e8b

Browse files
committed
Rename XARGO env var to XARGO_CHECK
This reflects the fact that we want bootstrap to override `xargo-check`, not `xargo
1 parent 7cdcdec commit 5960e8b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bin/cargo-miri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn cargo() -> Command {
101101
}
102102

103103
fn xargo() -> Command {
104-
if let Ok(val) = std::env::var("XARGO") {
104+
if let Ok(val) = std::env::var("XARGO_CHECK") {
105105
// Bootstrap tells us where to find xargo
106106
Command::new(val)
107107
} else {
@@ -280,7 +280,7 @@ fn setup(ask_user: bool) {
280280

281281
// First, we need xargo.
282282
if xargo_version().map_or(true, |v| v < XARGO_MIN_VERSION) {
283-
if std::env::var("XARGO").is_ok() {
283+
if std::env::var("XARGO_CHECK").is_ok() {
284284
// The user manually gave us a xargo binary; don't do anything automatically.
285285
show_error(format!("Your xargo is too old; please upgrade to the latest version"))
286286
}

0 commit comments

Comments
 (0)