Slightly refactor mingw detection

Author: mati865

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -685,8 +685,8 @@ fn link_natively(
     codegen_backend: &'static str,
 ) {
     info!("preparing {:?} to {:?}", crate_type, out_filename);
+    let self_contained_components = self_contained_components(sess, crate_type);
     let (linker_path, flavor) = linker_and_flavor(sess);
-    let self_contained_components = self_contained_components(sess, crate_type, &linker_path);
 
     // On AIX, we ship all libraries as .a big_af archive
     // the expected format is lib<name>.a(libname.so) for the actual
@@ -1760,7 +1760,13 @@ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
 }
 
 // Returns true if linker is located within sysroot
-fn detect_self_contained_mingw(sess: &Session, linker: &Path) -> bool {
+fn detect_self_contained_mingw(sess: &Session) -> bool {
+    let linker = if let Some(linker) = &sess.target.linker {
+        Path::new(linker.as_ref())
+    } else {
+        return false;
+    };
+
     // Assume `-C linker=rust-lld` as self-contained mode
     if linker == Path::new("rust-lld") {
         return true;
@@ -1772,7 +1778,7 @@ fn detect_self_contained_mingw(sess: &Session, linker: &Path) -> bool {
     };
     for dir in env::split_paths(&env::var_os("PATH").unwrap_or_default()) {
         let full_path = dir.join(&linker_with_extension);
-        // If linker comes from sysroot assume self-contained mode
+        // If linker doesn't come from sysroot assume non-self-contained mode
         if full_path.is_file() && !full_path.starts_with(sess.opts.sysroot.path()) {
             return false;
         }
@@ -1783,11 +1789,7 @@ fn detect_self_contained_mingw(sess: &Session, linker: &Path) -> bool {
 /// Various toolchain components used during linking are used from rustc distribution
 /// instead of being found somewhere on the host system.
 /// We only provide such support for a very limited number of targets.
-fn self_contained_components(
-    sess: &Session,
-    crate_type: CrateType,
-    linker: &Path,
-) -> LinkSelfContainedComponents {
+fn self_contained_components(sess: &Session, crate_type: CrateType) -> LinkSelfContainedComponents {
     // Turn the backwards compatible bool values for `self_contained` into fully inferred
     // `LinkSelfContainedComponents`.
     let self_contained =
@@ -1816,7 +1818,7 @@ fn self_contained_components(
                 LinkSelfContainedDefault::InferredForMingw => {
                     sess.host == sess.target
                         && sess.target.vendor != "uwp"
-                        && detect_self_contained_mingw(sess, linker)
+                        && detect_self_contained_mingw(sess)
                 }
             }
         };