Dogfood -Zno-embed-metadata in the compiler

Author: Kobzol

src/bootstrap/src/core/build_steps/check.rs

@@ -102,7 +102,7 @@ impl Step for Std {
         );
 
         let stamp = build_stamp::libstd_stamp(builder, build_compiler, target).with_prefix("check");
-        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], true, false);
+        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], false);
 
         drop(_guard);
 
@@ -144,7 +144,7 @@ impl Step for Std {
             self.build_compiler,
             target,
         );
-        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], true, false);
+        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], false);
     }
 
     fn metadata(&self) -> Option<StepMetadata> {
@@ -245,7 +245,7 @@ impl Step for Rustc {
         let stamp =
             build_stamp::librustc_stamp(builder, build_compiler, target).with_prefix("check");
 
-        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], true, false);
+        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], false);
 
         let libdir = builder.sysroot_target_libdir(build_compiler, target);
         let hostdir = builder.sysroot_target_libdir(build_compiler, build_compiler.host);
@@ -377,7 +377,7 @@ impl Step for CodegenBackend {
         let stamp = build_stamp::codegen_backend_stamp(builder, build_compiler, target, &backend)
             .with_prefix("check");
 
-        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], true, false);
+        run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], false);
     }
 
     fn metadata(&self) -> Option<StepMetadata> {
@@ -498,7 +498,7 @@ fn run_tool_check_step(
         .with_prefix(&format!("{display_name}-check"));
 
     let _guard = builder.msg(builder.kind, display_name, mode, build_compiler, target);
-    run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], true, false);
+    run_cargo(builder, cargo, builder.config.free_args.clone(), &stamp, vec![], false);
 }
 
 tool_check_step!(Rustdoc {

src/bootstrap/src/core/build_steps/clippy.rs

@@ -174,7 +174,6 @@ impl Step for Std {
             lint_args(builder, &self.config, IGNORED_RULES_FOR_STD_AND_RUSTC),
             &build_stamp::libstd_stamp(builder, build_compiler, target),
             vec![],
-            true,
             false,
         );
     }
@@ -257,7 +256,6 @@ impl Step for Rustc {
             lint_args(builder, &self.config, IGNORED_RULES_FOR_STD_AND_RUSTC),
             &build_stamp::librustc_stamp(builder, build_compiler, target),
             vec![],
-            true,
             false,
         );
     }
@@ -330,7 +328,6 @@ macro_rules! lint_any {
                     lint_args(builder, &self.config, &[]),
                     &stamp,
                     vec![],
-                    true,
                     false,
                 );
             }

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

@@ -302,7 +302,6 @@ impl Step for Std {
             vec![],
             &build_stamp::libstd_stamp(builder, build_compiler, target),
             target_deps,
-            self.is_for_mir_opt_tests, // is_check
             false,
         );
 
@@ -1146,7 +1145,6 @@ impl Step for Rustc {
             vec![],
             &stamp,
             vec![],
-            false,
             true, // Only ship rustc_driver.so and .rmeta files, not all intermediate .rlib files.
         );
 
@@ -1611,7 +1609,7 @@ impl Step for GccCodegenBackend {
 
         let _guard =
             builder.msg(Kind::Build, "codegen backend gcc", Mode::Codegen, build_compiler, target);
-        let files = run_cargo(builder, cargo, vec![], &stamp, vec![], false, false);
+        let files = run_cargo(builder, cargo, vec![], &stamp, vec![], false);
         write_codegen_backend_stamp(stamp, files, builder.config.dry_run())
     }
 
@@ -1695,7 +1693,7 @@ impl Step for CraneliftCodegenBackend {
             build_compiler,
             target,
         );
-        let files = run_cargo(builder, cargo, vec![], &stamp, vec![], false, false);
+        let files = run_cargo(builder, cargo, vec![], &stamp, vec![], false);
         write_codegen_backend_stamp(stamp, files, builder.config.dry_run())
     }
 
@@ -2402,7 +2400,6 @@ pub fn run_cargo(
     tail_args: Vec<String>,
     stamp: &BuildStamp,
     additional_target_deps: Vec<(PathBuf, DependencyType)>,
-    is_check: bool,
     rlib_only_metadata: bool,
 ) -> Vec<PathBuf> {
     // `target_root_dir` looks like $dir/$target/release
@@ -2446,7 +2443,7 @@ pub fn run_cargo(
                 // Always keep native libraries, rust dylibs and debuginfo
                 keep = true;
             }
-            if is_check && filename.ends_with(".rmeta") {
+            if filename.ends_with(".rmeta") {
                 // During check builds we need to keep crate metadata
                 keep = true;
             } else if rlib_only_metadata {

src/bootstrap/src/core/build_steps/test.rs

@@ -2348,7 +2348,7 @@ impl BookTest {
                 let stamp = BuildStamp::new(&builder.cargo_out(compiler, mode, target))
                     .with_prefix(PathBuf::from(dep).file_name().and_then(|v| v.to_str()).unwrap());
 
-                let output_paths = run_cargo(builder, cargo, vec![], &stamp, vec![], false, false);
+                let output_paths = run_cargo(builder, cargo, vec![], &stamp, vec![], false);
                 let directories = output_paths
                     .into_iter()
                     .filter_map(|p| p.parent().map(ToOwned::to_owned))

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

@@ -1009,6 +1009,8 @@ impl Builder<'_> {
         // Enable usage of unstable features
         cargo.env("RUSTC_BOOTSTRAP", "1");
 
+        cargo.arg("-Zno-embed-metadata");
+
         if self.config.dump_bootstrap_shims {
             prepare_behaviour_dump_dir(self.build);