From: Ralf Jung <post@ralfj.de>
Date: Sun, 9 Jun 2019 13:43:22 +0000 (+0200)
Subject: don't have both MIRI_SYSROOT and --sysroot
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=244011a47f1f6318d120035c1a3b6eb121bd95f1;p=rust.git

don't have both MIRI_SYSROOT and --sysroot
---

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index ae9b2efa675..53b849a1a70 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -458,6 +458,7 @@ fn inside_cargo_rustc() {
     } else {
         Command::new("rustc")
     };
+    command.env_remove("MIRI_SYSROOT"); // we already set the --sysroot flag
     command.args(&args);
     if has_arg_flag("-v") {
         eprintln!("+ {:?}", command);