Switch to using crate type

Author: Aaron1011

src/bin/cargo-miri.rs

@@ -85,6 +85,7 @@ fn get_arg_flag_value(name: &str) -> Option<String> {
 }
 
 fn is_build_dep(mut args: impl Iterator<Item = String>) -> bool {
+    //eprintln!("Out dir: {:?}", std::env::var("OUT_DIR"));
     args.any(|arg| arg.starts_with("--emit=") && arg.contains("link"))
 }
 
@@ -96,20 +97,26 @@ fn is_build_dep(mut args: impl Iterator<Item = String>) -> bool {
 // not the wrapper is being invoked on the target crate.
 // For now, this is the best we can do
 fn is_target_crate(is_build_script: bool) -> bool {
+    //eprintln!("Args: {:?}", std::env::args().collect::<Vec<_>>());
+    let is_bin = get_arg_flag_value("--crate-type").as_deref() == Some("bin");
+    let is_test = std::env::args().find(|arg| arg == "--test").is_some();
+    (is_bin || is_test) && !is_build_script
     // Cargo sets this to the directory containing the manifest of the crate
     // the wrapper is being invoekd to compile. This should be unique
     // across the entire build (except for build scripts, which we handle below).
     // We cannot check the crate name, since this may not be unique
     // (e.g. if the build contains multiple versions of the same crate,
     // or the same crate from multiple sources)
-    let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").ok();
+    //let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").ok();
 
     // The manifest directory for our target crate. This is set by `cargo-miri`
     // (the original invoation by the user) by using `cargo_metadata` to locate
     // the manifest.
-    let expected_dir = std::env::var("MIRI_MAGIC_DIR").expect("MIRI_MAGIC_DIR not set!");
+    //let expected_dir = std::env::var("MIRI_MAGIC_DIR").expect("MIRI_MAGIC_DIR not set!");
 
-    manifest_dir == Some(expected_dir) && !is_build_script
+    //manifest_dir == Some(expected_dir) && !is_build_script
+    //
+    //false
 
 }
 
@@ -427,7 +434,7 @@ path = "lib.rs"
     // architecture matches the host.
     let is_host = match target {
         None => true,
-        Some(target) => target == rustc_version::version_meta().unwrap().host,
+        Some(target) => target == host_triple(),
     };
     let sysroot = if is_host { dir.join("HOST") } else { PathBuf::from(dir) };
     std::env::set_var("MIRI_SYSROOT", &sysroot); // pass the env var to the processes we spawn, which will turn it into "--sysroot" flags
@@ -521,6 +528,17 @@ fn in_cargo_miri() {
             // The remaining targets we do not even want to build.
             _ => continue,
         }
+
+        let target = match get_arg_flag_value("--target") {
+            Some(target) => target,
+            None => {
+                let target = host_triple();
+                cmd.arg("--target").arg(&target);
+                target
+            }
+        };
+
+
         // Add user-defined args until first `--`.
         while let Some(arg) = args.next() {
             if arg == "--" {
@@ -530,7 +548,8 @@ fn in_cargo_miri() {
         }
 
         let args_vec: Vec<String> = args.collect();
-        cmd.env("MIRI_MAGIC_DIR", root_dir.clone());
+        cmd.env("MIRI_MAGIC_TARGET", target.clone());
+        //cmd.env("MIRI_MAGIC_DIR", root_dir.clone());
         cmd.env("MIRI_MAGIC_ARGS", serde_json::to_string(&args_vec).expect("failed to serialize args"));
 
         // Add `--` (to end the `cargo` flags), and then the user flags. We add markers around the
@@ -552,6 +571,10 @@ fn in_cargo_miri() {
     }
 }
 
+fn host_triple() -> String {
+    rustc_version::version_meta().unwrap().host
+}
+
 fn inside_cargo_rustc() {
     let sysroot = std::env::var("MIRI_SYSROOT").expect("The wrapper should have set MIRI_SYSROOT");