Ship rmeta files

Author: bjorn3

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

@@ -1892,14 +1892,12 @@ pub fn run_cargo(
                 || filename.ends_with(".a")
                 || is_debug_info(&filename)
                 || is_dylib(&filename)
+                || filename.ends_with(".rmeta")
             {
-                // Always keep native libraries, rust dylibs and debuginfo
+                // Always keep native libraries, rust dylibs, debuginfo and crate metadata
                 keep = true;
             }
-            if is_check && filename.ends_with(".rmeta") {
-                // During check builds we need to keep crate metadata
-                keep = true;
-            } else if rlib_only_metadata {
+            if !is_check && rlib_only_metadata {
                 if filename.contains("jemalloc_sys")
                     || filename.contains("rustc_smir")
                     || filename.contains("stable_mir")
@@ -1911,7 +1909,6 @@ pub fn run_cargo(
                     // Distribute the rest of the rustc crates as rmeta files only to reduce
                     // the tarball sizes by about 50%. The object files are linked into
                     // librustc_driver.so, so it is still possible to link against them.
-                    keep |= filename.ends_with(".rmeta");
                 }
             } else {
                 // In all other cases keep all rlibs