Change support library to rlib instead of dylib

May the Omnissiah bless this PR.

Author: jieyouxu

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

@@ -27,7 +27,6 @@ use crate::core::config::flags::get_completion;
 use crate::core::config::flags::Subcommand;
 use crate::core::config::TargetSelection;
 use crate::utils::cache::{Interned, INTERNER};
-use crate::utils::dylib::shared_lib_name;
 use crate::utils::exec::BootstrapCommand;
 use crate::utils::helpers::{
     self, add_link_lib_path, add_rustdoc_cargo_linker_args, dylib_path, dylib_path_var,
@@ -1365,7 +1364,7 @@ impl Step for RunMakeSupport {
         cargo.env("RUSTFLAGS", "-C prefer-dynamic");
         builder.run(&mut cargo);
 
-        let lib_name = shared_lib_name("run_make_support", &self.target.to_string());
+        let lib_name = "librun_make_support.rlib";
         let lib = builder.tools_dir(self.compiler).join(&lib_name);
 
         let cargo_out =

src/bootstrap/src/utils/dylib.rs

@@ -38,16 +38,3 @@ pub fn exe(name: &str, target: &str) -> String {
         name.to_string()
     }
 }
-
-/// Given a shared library called `name`, return the filename for the
-/// shared library for a particular target.
-#[allow(dead_code)]
-pub fn shared_lib_name(name: &str, target: &str) -> String {
-    if target.contains("windows") {
-        format!("{name}.dll")
-    } else if target.contains("apple") {
-        format!("lib{name}.dylib")
-    } else {
-        format!("lib{name}.so")
-    }
-}

src/tools/compiletest/src/runtest.rs

@@ -3741,7 +3741,7 @@ impl<'test> TestCx<'test> {
     fn run_rmake_v2_test(&self) {
         // For `run-make` V2, we need to perform 2 steps to build and run a `run-make` V2 recipe
         // (`rmake.rs`) to run the actual tests. The support library is already built as a tool
-        // dylib and is available under `build/$TARGET/stageN-tools-bin/librun_make_support.so`.
+        // dylib and is available under `build/$TARGET/stageN-tools-bin/librun_make_support.rlib`.
         //
         // 1. We need to build the recipe `rmake.rs` and link in the support library.
         // 2. We need to run the recipe to build and run the tests.
@@ -3764,13 +3764,7 @@ impl<'test> TestCx<'test> {
         let mut support_dylib_path = PathBuf::new();
         support_dylib_path.push(&build_root);
         support_dylib_path.push(format!("{}-tools-bin", stage));
-        if self.config.target.contains("windows") {
-            support_dylib_path.push("run_make_support.dll");
-        } else if self.config.target.contains("apple") {
-            support_dylib_path.push("librun_make_support.dylib");
-        } else {
-            support_dylib_path.push("librun_make_support.so");
-        }
+        support_dylib_path.push("librun_make_support.rlib");
 
         let mut stage_std_path = PathBuf::new();
         stage_std_path.push(&build_root);

src/tools/run-make-support/Cargo.toml

@@ -3,8 +3,5 @@ name = "run_make_support"
 version = "0.0.0"
 edition = "2021"
 
-[lib]
-crate-type = ["dylib"]
-
 [dependencies]
 shell-words = "1.1"