From 09f30cabf0bb01131080032ae9858c065b64ac8b Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 9 Jun 2019 13:48:18 +0200
Subject: [PATCH] cargo miri: make sure we see the same sysroot for rustc and
 miri

---
 src/bin/cargo-miri.rs | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index 55c53e7361a..5e3a35917b2 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -119,6 +119,39 @@ fn list_targets() -> impl Iterator<Item=cargo_metadata::Target> {
     package.targets.into_iter()
 }
 
+/// Make sure that the `miri` and `rustc` binary are from the same sysroot.
+/// This can be violated e.g. when miri is locally built and installed with a different
+/// toolchain than what is used when `cargo miri` is run.
+fn test_sysroot_consistency() {
+    fn get_sysroot(mut cmd: Command) -> PathBuf {
+        let out = cmd.arg("--print").arg("sysroot")
+            .env_remove("MIRI_SYSROOT") // We want to test their "native" sysroot, not the manually set one
+            .output().expect("Failed to run rustc to get sysroot info");
+        assert!(out.status.success(), "Bad statuc code when getting sysroot info");
+        let sysroot = out.stdout.lines().nth(0)
+            .expect("didn't get at least one line for the sysroot").unwrap();
+        PathBuf::from(sysroot).canonicalize()
+            .expect("Failed to canonicalize sysroot")
+    }
+
+    let rustc_sysroot = get_sysroot(Command::new("rustc"));
+    let miri_sysroot = {
+        let mut path = std::env::current_exe().expect("current executable path invalid");
+        path.set_file_name("miri");
+        get_sysroot(Command::new(path))
+    };
+
+    if rustc_sysroot != miri_sysroot {
+        show_error(format!(
+            "miri was built for a different sysroot than the rustc in your current toolchain.\n\
+             Make sure you use the same toolchain to run miri that you used to build it!\n\
+             rustc sysroot: `{}`\n\
+             miri sysroot: `{}`",
+             rustc_sysroot.display(), miri_sysroot.display()
+        ));
+    }
+}
+
 fn xargo_version() -> Option<(u32, u32, u32)> {
     let out = Command::new("xargo").arg("--version").output().ok()?;
     if !out.status.success() {
@@ -269,7 +302,7 @@ fn setup(ask_user: bool) {
     if print_env {
         println!("MIRI_SYSROOT={}", sysroot.display());
     } else if !ask_user {
-        println!("A libstd for Miri is now available in `{}`", sysroot.display());
+        println!("A libstd for Miri is now available in `{}`.", sysroot.display());
     }
 }
 
@@ -313,6 +346,9 @@ fn in_cargo_miri() {
     };
     let verbose = has_arg_flag("-v");
 
+    // Some basic sanity checks
+    test_sysroot_consistency();
+
     // We always setup.
     let ask = subcommand != MiriCommand::Setup;
     setup(ask);
-- 
2.44.0