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

bin/miri.rs looks for RUST_SYSROOT, so should bin/cargo-miri.rs

Browse source
This commit is contained in:
Ralf Jung 2017-05-30 14:05:41 -07:00
parent f85c7a2c4d
commit 6619ed89ba
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

@ -103,7 +103,7 @@ fn main() {
let sys_root = if let (Some(home), Some(toolchain)) = (home, toolchain) {
format!("{}/toolchains/{}", home, toolchain)
} else {
option_env!("SYSROOT")
option_env!("RUST_SYSROOT")
.map(|s| s.to_owned())
.or_else(|| {
Command::new("rustc")
@ -114,7 +114,7 @@ fn main() {
.and_then(|out| String::from_utf8(out.stdout).ok())
.map(|s| s.trim().to_owned())
})
.expect("need to specify SYSROOT env var during miri compilation, or use rustup or multirust")
.expect("need to specify RUST_SYSROOT env var during miri compilation, or use rustup or multirust")
};
// this conditional check for the --sysroot flag is there so users can call `cargo-clippy` directly