Ship rmeta files

Author: bjorn3

src/bootstrap/check.rs

@@ -90,14 +90,7 @@ impl Step for Std {
             "Checking stage{} std artifacts ({} -> {})",
             builder.top_stage, &compiler.host, target
         ));
-        run_cargo(
-            builder,
-            cargo,
-            args(builder),
-            &libstd_stamp(builder, compiler, target),
-            vec![],
-            true,
-        );
+        run_cargo(builder, cargo, args(builder), &libstd_stamp(builder, compiler, target), vec![]);
 
         // We skip populating the sysroot in non-zero stage because that'll lead
         // to rlib/rmeta conflicts if std gets built during this session.
@@ -146,7 +139,6 @@ impl Step for Std {
             args(builder),
             &libstd_test_stamp(builder, compiler, target),
             vec![],
-            true,
         );
     }
 }
@@ -222,7 +214,6 @@ impl Step for Rustc {
             args(builder),
             &librustc_stamp(builder, compiler, target),
             vec![],
-            true,
         );
 
         let libdir = builder.sysroot_libdir(compiler, target);
@@ -287,7 +278,6 @@ impl Step for CodegenBackend {
             args(builder),
             &codegen_backend_stamp(builder, compiler, target, backend),
             vec![],
-            true,
         );
     }
 }
@@ -354,7 +344,6 @@ macro_rules! tool_check_step {
                     args(builder),
                     &stamp(builder, compiler, target),
                     vec![],
-                    true,
                 );
 
                 /// Cargo's output path in a given stage, compiled by a particular

src/bootstrap/compile.rs

@@ -112,14 +112,7 @@ impl Step for Std {
             "Building stage{} std artifacts ({} -> {})",
             compiler.stage, &compiler.host, target
         ));
-        run_cargo(
-            builder,
-            cargo,
-            vec![],
-            &libstd_stamp(builder, compiler, target),
-            target_deps,
-            false,
-        );
+        run_cargo(builder, cargo, vec![], &libstd_stamp(builder, compiler, target), target_deps);
 
         builder.ensure(StdLink {
             compiler: builder.compiler(compiler.stage, builder.config.build),
@@ -629,14 +622,7 @@ impl Step for Rustc {
             "Building stage{} compiler artifacts ({} -> {})",
             compiler.stage, &compiler.host, target
         ));
-        run_cargo(
-            builder,
-            cargo,
-            vec![],
-            &librustc_stamp(builder, compiler, target),
-            vec![],
-            false,
-        );
+        run_cargo(builder, cargo, vec![], &librustc_stamp(builder, compiler, target), vec![]);
 
         builder.ensure(RustcLink {
             compiler: builder.compiler(compiler.stage, builder.config.build),
@@ -839,7 +825,7 @@ impl Step for CodegenBackend {
             "Building stage{} codegen backend {} ({} -> {})",
             compiler.stage, backend, &compiler.host, target
         ));
-        let files = run_cargo(builder, cargo, vec![], &tmp_stamp, vec![], false);
+        let files = run_cargo(builder, cargo, vec![], &tmp_stamp, vec![]);
         if builder.config.dry_run {
             return;
         }
@@ -1232,7 +1218,6 @@ pub fn run_cargo(
     tail_args: Vec<String>,
     stamp: &Path,
     additional_target_deps: Vec<(PathBuf, DependencyType)>,
-    is_check: bool,
 ) -> Vec<PathBuf> {
     if builder.config.dry_run {
         return Vec::new();
@@ -1271,7 +1256,7 @@ pub fn run_cargo(
                 || filename.ends_with(".a")
                 || is_debug_info(&filename)
                 || is_dylib(&filename)
-                || (is_check && filename.ends_with(".rmeta")))
+                || filename.ends_with(".rmeta"))
             {
                 continue;
             }