rustc_session: Add a helper function for obtaining staticlib prefix and suffix

2 files changed, 5 insertions, 12 deletions

diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 360f6d82dbc..a564e0e391f 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1494,11 +1494,7 @@ fn print_native_static_libs(
                 | NativeLibKind::Unspecified => {
                     let verbatim = lib.verbatim;
                     if sess.target.is_like_msvc {
-                        let (prefix, suffix) = if verbatim {
-                            ("", "")
-                        } else {
-                            (&*sess.target.staticlib_prefix, &*sess.target.staticlib_suffix)
-                        };
+                        let (prefix, suffix) = sess.staticlib_components(verbatim);
                         Some(format!("{prefix}{name}{suffix}"))
                     } else if sess.target.linker_flavor.is_gnu() {
                         Some(format!("-l{}{}", if verbatim { ":" } else { "" }, name))
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
index 7f24d79b83b..bcf18cf57be 100644
--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
+++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
@@ -450,9 +450,10 @@ impl<'a> GccLinker<'a> {
                     // The output filename already contains `dll_suffix` so
                     // the resulting import library will have a name in the
                     // form of libfoo.dll.a
-                    let mut implib_name = OsString::from(&*self.sess.target.staticlib_prefix);
+                    let (prefix, suffix) = self.sess.staticlib_components(false);
+                    let mut implib_name = OsString::from(prefix);
                     implib_name.push(name);
-                    implib_name.push(&*self.sess.target.staticlib_suffix);
+                    implib_name.push(suffix);
                     let mut out_implib = OsString::from("--out-implib=");
                     out_implib.push(out_filename.with_file_name(implib_name));
                     self.link_arg(out_implib);
@@ -959,11 +960,7 @@ impl<'a> Linker for MsvcLinker<'a> {
             self.link_staticlib_by_path(&path, whole_archive);
         } else {
             let opts = if whole_archive { "/WHOLEARCHIVE:" } else { "" };
-            let (prefix, suffix) = if verbatim {
-                ("", "")
-            } else {
-                (&*self.sess.target.staticlib_prefix, &*self.sess.target.staticlib_suffix)
-            };
+            let (prefix, suffix) = self.sess.staticlib_components(verbatim);
             self.link_arg(format!("{opts}{prefix}{name}{suffix}"));
         }
     }