Pass -Zno-embed-metadata in run_cargo

Author: bjorn3

src/bootstrap/src/core/build_steps/compile.rs

@@ -2661,7 +2661,7 @@ pub enum ArtifactKeepMode {
 
 pub fn run_cargo(
     builder: &Builder<'_>,
-    cargo: Cargo,
+    mut cargo: Cargo,
     tail_args: Vec<String>,
     stamp: &BuildStamp,
     additional_target_deps: Vec<(PathBuf, DependencyType)>,
@@ -2679,6 +2679,16 @@ pub fn run_cargo(
         .unwrap() // chop off `$target`
         .join(target_root_dir.file_name().unwrap());
 
+    match artifact_keep_mode {
+        ArtifactKeepMode::OnlyDylib
+        | ArtifactKeepMode::OnlyRmeta
+        | ArtifactKeepMode::BothRlibAndRmeta
+        | ArtifactKeepMode::Custom(_) => {
+            cargo.arg("-Zno-embed-metadata");
+        }
+        ArtifactKeepMode::OnlyRlib => {}
+    }
+
     // Spawn Cargo slurping up its JSON output. We'll start building up the
     // `deps` array of all files it generated along with a `toplevel` array of
     // files we need to probe for later.

src/bootstrap/src/core/builder/cargo.rs

@@ -1095,10 +1095,6 @@ impl Builder<'_> {
         // Enable usage of unstable features
         cargo.env("RUSTC_BOOTSTRAP", "1");
 
-        if matches!(mode, Mode::Std | Mode::Rustc | Mode::Codegen) {
-            cargo.arg("-Zno-embed-metadata");
-        }
-
         if self.config.dump_bootstrap_shims {
             prepare_behaviour_dump_dir(self.build);