Fix run-make rmake.rs tests

rust-lang · Mar 10, 2024 · 676455f · 676455f
1 parent c8e3ab3
commit 676455f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
@@ -1530,10 +1530,16 @@ impl<'a> Builder<'a> {
         hostflags.arg("-Zunstable-options");
         hostflags.arg("--check-cfg=cfg(bootstrap)");
 
-        // cfg(bootstrap) unconditionally pass this once the bootstrap compiler understands it
-        if stage != 0 {
-            // FIXME remove once cargo enables this by default
-            rustflags.arg("-Zsplit-metadata");
+        match mode {
+            Mode::Std | Mode::Rustc | Mode::Codegen => {
+                // cfg(bootstrap) unconditionally pass this once the bootstrap compiler understands it
+                if stage != 0 {
+                    // FIXME remove once cargo enables this by default
+                    rustflags.arg("-Zsplit-metadata");
+                }
+            }
+            // Tools may not expect to be compiled with -Zsplit-metadata
+            Mode::ToolBootstrap | Mode::ToolStd | Mode::ToolRustc => {}
         }
 
         // FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`,