address review feedback

Author: mati865

compiler/rustc_codegen_cranelift/src/toolchain.rs

@@ -4,10 +4,12 @@ use std::path::PathBuf;
 
 use rustc_codegen_ssa::back::link::linker_and_flavor;
 use rustc_session::Session;
+use rustc_target::spec::LinkSelfContainedComponents;
 
 /// Tries to infer the path of a binary for the target toolchain from the linker name.
 pub(crate) fn get_toolchain_binary(sess: &Session, tool: &str) -> PathBuf {
-    let (mut linker, _linker_flavor) = linker_and_flavor(sess, false);
+    let (mut linker, _linker_flavor) =
+        linker_and_flavor(sess, &LinkSelfContainedComponents::empty());
     let linker_file_name =
         linker.file_name().unwrap().to_str().expect("linker filename should be valid UTF-8");
 

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -686,8 +686,7 @@ fn link_natively(
 ) {
     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, self_contained_components.is_linker_enabled());
+    let (linker_path, flavor) = linker_and_flavor(sess, &self_contained_components);
 
     // On AIX, we ship all libraries as .a big_af archive
     // the expected format is lib<name>.a(libname.so) for the actual
@@ -1319,7 +1318,10 @@ pub fn ignored_for_lto(sess: &Session, info: &CrateInfo, cnum: CrateNum) -> bool
 }
 
 /// This functions tries to determine the appropriate linker (and corresponding LinkerFlavor) to use
-pub fn linker_and_flavor(sess: &Session, self_contained: bool) -> (PathBuf, LinkerFlavor) {
+pub fn linker_and_flavor(
+    sess: &Session,
+    self_contained_components: &LinkSelfContainedComponents,
+) -> (PathBuf, LinkerFlavor) {
     fn infer_from(
         sess: &Session,
         linker: Option<PathBuf>,
@@ -1418,11 +1420,11 @@ pub fn linker_and_flavor(sess: &Session, self_contained: bool) -> (PathBuf, Link
         return ret;
     }
 
-    // When using a supported target in self-contained mode, we want to use rust-lld directly.
+    // When using a supported target in self-contained linker mode, we want to use rust-lld directly.
     let self_contained_target = sess.target.os == "windows"
         && sess.target.env == "gnu"
         && sess.target.abi == "llvm"
-        && self_contained;
+        && self_contained_components.is_linker_enabled();
     if self_contained_target
         && let Some(ret) =
             infer_from(sess, None, Some(LinkerFlavor::Gnu(Cc::No, Lld::Yes)), features)