Rollup merge of #81618 - bjorn3:sync_cg_clif-2021-02-01, r=bjorn3

[rust.git] / src / toolchain.rs

diff --git a/src/toolchain.rs b/src/toolchain.rs
index 121f4477b80e0da072887f1e4ef3128608f84927..735c59d70c1201a87f322b26c29c687d8fdc4796 100644 (file)
--- a/src/toolchain.rs
+++ b/src/toolchain.rs
@@ -1,3 +1,5 @@
+//! Locating various executables part of a C toolchain.
+
 use std::path::PathBuf;
 
 use rustc_middle::bug;
@@ -89,10 +91,10 @@ fn infer_from(
                 } else if stem == "link" || stem == "lld-link" {
                     LinkerFlavor::Msvc
                 } else if stem == "lld" || stem == "rust-lld" {
-                    LinkerFlavor::Lld(sess.target.target.options.lld_flavor)
+                    LinkerFlavor::Lld(sess.target.lld_flavor)
                 } else {
                     // fall back to the value in the target spec
-                    sess.target.target.linker_flavor
+                    sess.target.linker_flavor
                 };
 
                 Some((linker, flavor))
@@ -113,8 +115,8 @@ fn infer_from(
 
     if let Some(ret) = infer_from(
         sess,
-        sess.target.target.options.linker.clone().map(PathBuf::from),
-        Some(sess.target.target.linker_flavor),
+        sess.target.linker.clone().map(PathBuf::from),
+        Some(sess.target.linker_flavor),
     ) {
         return ret;
     }