new helper functions and rename

Author: Oneirical

src/tools/run-make-support/src/lib.rs

@@ -40,12 +40,17 @@ pub fn target() -> String {
 
 /// Check if target is windows-like.
 pub fn is_windows() -> bool {
-    env::var_os("IS_WINDOWS").is_some()
+    target().contains("windows")
 }
 
 /// Check if target uses msvc.
 pub fn is_msvc() -> bool {
-    env::var_os("IS_MSVC").is_some()
+    target().contains("msvc")
+}
+
+/// Check if target uses macOS.
+pub fn is_darwin() -> bool {
+    target().contains("darwin")
 }
 
 /// Construct a path to a static library under `$TMPDIR` given the library name. This will return a
@@ -84,7 +89,7 @@ pub fn static_lib_name(name: &str) -> String {
     // ```
     assert!(!name.contains(char::is_whitespace), "static library name cannot contain whitespace");
 
-    if target().contains("msvc") { format!("{name}.lib") } else { format!("lib{name}.a") }
+    if is_msvc() { format!("{name}.lib") } else { format!("lib{name}.a") }
 }
 
 /// Construct a path to a dynamic library under `$TMPDIR` given the library name. This will return a
@@ -110,15 +115,21 @@ pub fn dynamic_lib_name(name: &str) -> String {
     // ```
     assert!(!name.contains(char::is_whitespace), "dynamic library name cannot contain whitespace");
 
-    if target().contains("darwin") {
+    if is_darwin() {
         format!("lib{name}.dylib")
-    } else if target().contains("windows") {
+    } else if is_windows() {
         format!("{name}.dll")
     } else {
         format!("lib{name}.so")
     }
 }
 
+/// Construct a path to a rust library (rlib) under `$TMPDIR` given the library name. This will return a
+/// path with `$TMPDIR` joined with the library name.
+pub fn rust_lib(name: &str) -> PathBuf {
+    tmp_dir().join(format!("lib{name}.rlib"))
+}
+
 /// Construct the binary name based on platform.
 pub fn bin_name(name: &str) -> String {
     if is_windows() { format!("{name}.exe") } else { name.to_string() }

src/tools/run-make-support/src/rustc.rs

@@ -91,7 +91,7 @@ impl Rustc {
         self
     }
 
-    /// Specify path to the output file.
+    /// Specify path to the output file. Equivalent to `-o`` in rustc.
     pub fn output<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
         self.cmd.arg("-o");
         self.cmd.arg(path.as_ref());
@@ -150,7 +150,7 @@ impl Rustc {
         self
     }
 
-    /// Add a directory to the library search path.
+    /// Add a directory to the library search path. Equivalent to `-L`` in rustc.
     pub fn library_search_path<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
         self.cmd.arg("-L");
         self.cmd.arg(path.as_ref());

tests/run-make/issue-11908/bar.rs renamed to tests/run-make/same-lib-two-locations-no-panic/bar.rs

@@ -11,22 +11,22 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::{dynamic_lib, rustc, tmp_dir};
+use run_make_support::{dynamic_lib, rust_lib, rustc, tmp_dir};
 use std::fs;
 
 fn main() {
     let tmp_dir_other = tmp_dir().join("other");
 
     fs::create_dir(&tmp_dir_other);
-    rustc().input("foo.rs").crate_type("dylib").codegen_option("prefer-dynamic").run();
+    rustc().input("foo.rs").crate_type("dylib").prefer_dynamic().run();
     fs::rename(dynamic_lib("foo"), &tmp_dir_other);
-    rustc().input("foo.rs").crate_type("dylib").codegen_option("prefer-dynamic").run();
+    rustc().input("foo.rs").crate_type("dylib").prefer_dynamic().run();
     rustc().input("bar.rs").library_search_path(&tmp_dir_other).run();
     fs::remove_dir_all(tmp_dir());
 
     fs::create_dir_all(&tmp_dir_other);
     rustc().input("foo.rs").crate_type("rlib").run();
-    fs::rename(tmp_dir().join("libfoo.rlib"), &tmp_dir_other);
+    fs::rename(rust_lib("foo"), &tmp_dir_other);
     rustc().input("foo.rs").crate_type("rlib").run();
     rustc().input("bar.rs").library_search_path(tmp_dir_other).run();
 }