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

honor CARGO env var (for rustc bootstrap)

Browse source
This commit is contained in:
Ralf Jung 2019-08-02 18:02:54 +02:00
parent f0e871785f
commit 0dab3d5ee1
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,7 +231,14 @@ fn setup(ask_user: bool) {
} else {
println!("Installing xargo: `cargo install xargo -f`");
}
if !Command::new("cargo").args(&["install", "xargo", "-f"]).status().unwrap().success() {
let mut cargo = if let Ok(val) = std::env::var("CARGO") {
// In rustc bootstrap, an env var tells us where to find cargo.
Command::new(val)
} else {
Command::new("cargo")
};
if !cargo.args(&["install", "xargo", "-f"]).status().unwrap().success() {
show_error(format!("Failed to install xargo"));
}
}