From 43653c1835d59de69c6a5977b52df4708e6fddca Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sun, 23 Mar 2025 22:13:52 +0300
Subject: linker: Fix staticlib naming for UEFI

It uses `libname.a` instead of the standard MSVC naming `name.lib`.

Naming for import libraries isn't touched.
---
 compiler/rustc_codegen_ssa/src/back/link.rs   |  7 ++++++-
 compiler/rustc_codegen_ssa/src/back/linker.rs | 10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'compiler/rustc_codegen_ssa')

diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 74597f6263d..99b4591051a 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1494,7 +1494,12 @@ fn print_native_static_libs(
                 | NativeLibKind::Unspecified => {
                     let verbatim = lib.verbatim;
                     if sess.target.is_like_msvc {
-                        Some(format!("{}{}", name, if verbatim { "" } else { ".lib" }))
+                        let (prefix, suffix) = if verbatim {
+                            ("", "")
+                        } else {
+                            (&*sess.target.staticlib_prefix, &*sess.target.staticlib_suffix)
+                        };
+                        Some(format!("{prefix}{name}{suffix}"))
                     } else if sess.target.linker_flavor.is_gnu() {
                         Some(format!("-l{}{}", if verbatim { ":" } else { "" }, name))
                     } else {
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
index 3f5e0c1bce9..7f24d79b83b 100644
--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
+++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
@@ -958,9 +958,13 @@ impl<'a> Linker for MsvcLinker<'a> {
         if let Some(path) = try_find_native_static_library(self.sess, name, verbatim) {
             self.link_staticlib_by_path(&path, whole_archive);
         } else {
-            let prefix = if whole_archive { "/WHOLEARCHIVE:" } else { "" };
-            let suffix = if verbatim { "" } else { ".lib" };
-            self.link_arg(format!("{prefix}{name}{suffix}"));
+            let opts = if whole_archive { "/WHOLEARCHIVE:" } else { "" };
+            let (prefix, suffix) = if verbatim {
+                ("", "")
+            } else {
+                (&*self.sess.target.staticlib_prefix, &*self.sess.target.staticlib_suffix)
+            };
+            self.link_arg(format!("{opts}{prefix}{name}{suffix}"));
         }
     }
 
-- 
cgit 1.4.1-3-g733a5