From 6619ed89baf3153bb8137e77552bcc7bdf31e3fa Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 30 May 2017 14:05:41 -0700 Subject: [PATCH] bin/miri.rs looks for RUST_SYSROOT, so should bin/cargo-miri.rs --- src/bin/cargo-miri.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs index b643c83395fd..f67bbd39a748 100644 --- a/src/bin/cargo-miri.rs +++ b/src/bin/cargo-miri.rs @@ -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