Let std use proc macros for its compilation

Author: est31

src/bootstrap/builder.rs

@@ -838,7 +838,13 @@ impl<'a> Builder<'a> {
             // already-passed -C metadata flag with our own. Our rustc.rs
             // wrapper around the actual rustc will detect -C metadata being
             // passed and frob it with this extra string we're passing in.
-            cargo.env("RUSTC_METADATA_SUFFIX", "rustc");
+            let suffix = match mode {
+                Mode::Std => "rustc-std",
+                Mode::Test => "rustc-test",
+                Mode::Codegen | Mode::Rustc => "rustc-rustc",
+                Mode::ToolStd | Mode::ToolTest | Mode::ToolRustc => "rustc-tools",
+            };
+            cargo.env("RUSTC_METADATA_SUFFIX", suffix);
         }
 
         if let Some(x) = self.crt_static(target) {

src/bootstrap/compile.rs

@@ -1121,28 +1121,28 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
             CargoMessage::CompilerArtifact { filenames, .. } => filenames,
             _ => return,
         };
-        for filename in filenames {
+        for filename in filenames.iter() {
             // Skip files like executables
             if !filename.ends_with(".rlib") &&
                !filename.ends_with(".lib") &&
                !is_dylib(&filename) &&
                !(is_check && filename.ends_with(".rmeta")) {
-                return;
+                break;
             }
 
-            let filename = Path::new(&*filename);
+            let filename = Path::new(&**filename);
 
             // If this was an output file in the "host dir" we don't actually
             // worry about it, it's not relevant for us.
             if filename.starts_with(&host_root_dir) {
-                return;
+                break;
             }
 
             // If this was output in the `deps` dir then this is a precise file
             // name (hash included) so we start tracking it.
             if filename.starts_with(&target_deps_dir) {
                 deps.push(filename.to_path_buf());
-                return;
+                break;
             }
 
             // Otherwise this was a "top level artifact" which right now doesn't
@@ -1163,6 +1163,33 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
 
             toplevel.push((file_stem, extension, expected_len));
         }
+        for filename in filenames {
+            // Skip files like executables
+            if !filename.ends_with(".rlib") &&
+               !filename.ends_with(".lib") &&
+               !is_dylib(&filename) &&
+               !(is_check && filename.ends_with(".rmeta")) {
+                break;
+            }
+
+            let filename = Path::new(&*filename);
+
+            // If this was an output file in the "host dir" we don't actually
+            // worry about it, it's not relevant for us.
+            if filename.starts_with(&host_root_dir) {
+                let f = filename.file_name();
+                if deps.iter().find(|v| v.file_name() == f).is_none() {
+                    deps.push(filename.to_path_buf());
+                }
+                continue;
+            }
+
+            // If this was output in the `deps` dir then this is a precise file
+            // name (hash included) so we start tracking it.
+            if filename.starts_with(&target_deps_dir) {
+                break;
+            }
+        }
     });
 
     if !ok {