user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename XARGO env var to XARGO_CHECK

Browse source 
This reflects the fact that we want bootstrap to override `xargo-check`,
not `xargo
This commit is contained in:
Aaron Hill 2020-03-02 14:17:14 -05:00
parent 7cdcdecb01
commit 5960e8b80e
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bin/cargo-miri.rs
View file

@ -101,7 +101,7 @@ fn cargo() -> Command {
}
fn xargo() -> Command {
if let Ok(val) = std::env::var("XARGO") {
if let Ok(val) = std::env::var("XARGO_CHECK") {
// Bootstrap tells us where to find xargo
Command::new(val)
} else {
@ -280,7 +280,7 @@ fn setup(ask_user: bool) {
// First, we need xargo.
if xargo_version().map_or(true, |v| v < XARGO_MIN_VERSION) {
if std::env::var("XARGO").is_ok() {
if std::env::var("XARGO_CHECK").is_ok() {
// The user manually gave us a xargo binary; don't do anything automatically.
show_error(format!("Your xargo is too old; please upgrade to the latest version"))
}