Auto merge of rust-lang#139242 - jieyouxu:run-make-artifact-names-cross, r=<try>

Fix `run-make-support` artifact name calculations for target on cross-compile

This was implemented incorrectly during the porting process, where we relied on std consts. However, `run-make-support` is a host-only library, which meant that these artifact names were for the *host* and not the *target*.

Helps with rust-lang#138066.

r? `@Kobzol`

`@rustbot` author (needs try-jobs)

try-job: armhf-gnu
try-job: test-various
try-job: `*windows*`
try-job: `*apple*`

Author: bors

src/bootstrap/src/utils/shared_helpers.rs

@@ -45,6 +45,7 @@ pub fn dylib_path() -> Vec<std::path::PathBuf> {
 
 /// Given an executable called `name`, return the filename for the
 /// executable for a particular target.
+// Intentionally duplicated with the `exe_name` helper in `build_helpers::artifact_names`.
 pub fn exe(name: &str, target: &str) -> String {
     if target.contains("windows") {
         format!("{name}.exe")

src/build_helper/src/artifact_names.rs

@@ -0,0 +1,38 @@
+/// Given a dynamic library name, construct its filename for the given target.
+pub fn dynamic_lib_name(name: &str, target: &str) -> String {
+    format!("{}{name}.{}", dynamic_lib_prefix(target), dynamic_lib_extension(target))
+}
+
+fn dynamic_lib_prefix(target: &str) -> &'static str {
+    if target.contains("windows") { "" } else { "lib" }
+}
+
+/// Get the dylib extension for the given target.
+pub fn dynamic_lib_extension(target: &str) -> &'static str {
+    if target.contains("apple") {
+        "dylib"
+    } else if target.contains("windows") {
+        "dll"
+    } else {
+        "so"
+    }
+}
+
+/// Given a dynamic library name, construct its filename for the given target.
+// Intentionally duplicated with the `exe` helper in `bootstrap::utils::shared_helpers`.
+pub fn exe_name(name: &str, target: &str) -> String {
+    if target.contains("windows") {
+        format!("{name}.exe")
+    } else if target.contains("uefi") {
+        format!("{name}.efi")
+    } else if target.contains("wasm") {
+        format!("{name}.wasm")
+    } else {
+        name.to_string()
+    }
+}
+
+/// Given a static library name, construct its filename for the given target.
+pub fn static_lib_name(name: &str, target: &str) -> String {
+    if target.contains("msvc") { format!("{name}.lib") } else { format!("lib{name}.a") }
+}

src/build_helper/src/lib.rs

@@ -1,5 +1,6 @@
 //! Types and functions shared across tools in this workspace.
 
+pub mod artifact_names;
 pub mod ci;
 pub mod drop_bomb;
 pub mod fs;

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

@@ -1,24 +1,25 @@
 //! A collection of helpers to construct artifact names, such as names of dynamic or static
-//! librarys which are target-dependent.
-
-// FIXME(jieyouxu): convert these to return `PathBuf`s instead of strings!
+//! libraries which are target-dependent.
 
+use crate::target;
 use crate::targets::is_msvc;
 
 /// Construct the static library name based on the target.
+#[track_caller]
 #[must_use]
 pub fn static_lib_name(name: &str) -> String {
     assert!(!name.contains(char::is_whitespace), "static library name cannot contain whitespace");
 
-    if is_msvc() { format!("{name}.lib") } else { format!("lib{name}.a") }
+    build_helper::artifact_names::static_lib_name(name, &target())
 }
 
 /// Construct the dynamic library name based on the target.
+#[track_caller]
 #[must_use]
 pub fn dynamic_lib_name(name: &str) -> String {
     assert!(!name.contains(char::is_whitespace), "dynamic library name cannot contain whitespace");
 
-    format!("{}{name}.{}", std::env::consts::DLL_PREFIX, std::env::consts::DLL_EXTENSION)
+    build_helper::artifact_names::dynamic_lib_name(name, &target())
 }
 
 /// Construct the name of the import library for the dynamic library, exclusive to MSVC and
@@ -35,17 +36,19 @@ pub fn msvc_import_dynamic_lib_name(name: &str) -> String {
 /// Construct the dynamic library extension based on the target.
 #[must_use]
 pub fn dynamic_lib_extension() -> &'static str {
-    std::env::consts::DLL_EXTENSION
+    build_helper::artifact_names::dynamic_lib_extension(&target())
 }
 
 /// Construct the name of a rust library (rlib).
+#[track_caller]
 #[must_use]
 pub fn rust_lib_name(name: &str) -> String {
     format!("lib{name}.rlib")
 }
 
 /// Construct the binary (executable) name based on the target.
+#[track_caller]
 #[must_use]
 pub fn bin_name(name: &str) -> String {
-    format!("{name}{}", std::env::consts::EXE_SUFFIX)
+    build_helper::artifact_names::exe_name(name, &target())
 }