restore rust-lld with windows-gnu

Author: mati865

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1781,21 +1781,12 @@ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
 // using rust-lld directly (`-gnullvm`) or using shipped cc to call the linker (`-gnu`).
 // Eventually, `-gnu` toolchains might be moved to calling the linker directly.
 fn detect_self_contained_mingw(sess: &Session) -> bool {
-    // Passing custom linker means non-self-contained mode.
-    if sess.opts.cg.linker.is_some() {
-        // Unless running on `-windows-gnu-llvm` and using `-C linker=rust-lld`.
-        if sess.target.abi == Abi::Llvm {
-            return sess
-                .opts
-                .cg
-                .linker
-                .as_ref()
-                .is_some_and(|linker| linker == Path::new("rust-lld"));
-        }
-
-        return false;
+    // Passing explicit linker other than `rust-lld` means non-self-contained mode.
+    if let Some(linker) = &sess.opts.cg.linker {
+        return linker == Path::new("rust-lld");
     }
 
+    // If no explicit linker was given, proceed with implicit one (if present);
     let linker_with_extension = if let Some(linker) = sess.target.linker.as_deref().map(Path::new) {
         linker.with_extension("exe")
     } else {