Remap debuginfo for all crates.

1 files changed, 3 insertions, 13 deletions

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index c524cf646dd..8d59d2e93c0 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -287,10 +287,6 @@ fn main() {
                 cmd.arg("-C").arg("target-feature=-crt-static");
             }
         }
-
-        if let Ok(map) = env::var("RUSTC_DEBUGINFO_MAP") {
-            cmd.arg("--remap-path-prefix").arg(&map);
-        }
     } else {
         // Override linker if necessary.
         if let Ok(host_linker) = env::var("RUSTC_HOST_LINKER") {
@@ -305,16 +301,10 @@ fn main() {
                 cmd.arg("-C").arg("target-feature=-crt-static");
             }
         }
+    }
 
-        let crate_type = args.windows(2)
-            .find(|w| &*w[0] == "--crate-type")
-            .and_then(|w| w[1].to_str());
-
-        if let Some("proc-macro") = crate_type {
-            if let Ok(map) = env::var("RUSTC_DEBUGINFO_MAP") {
-                cmd.arg("--remap-path-prefix").arg(&map);
-            }
-        }
+    if let Ok(map) = env::var("RUSTC_DEBUGINFO_MAP") {
+        cmd.arg("--remap-path-prefix").arg(&map);
     }
 
     // Force all crates compiled by this compiler to (a) be unstable and (b)