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 463afaf7cc50cd66c6b773f1bdc3b65f126f76bd..735c59d70c1201a87f322b26c29c687d8fdc4796 100644 (file)
--- a/src/toolchain.rs
+++ b/src/toolchain.rs
@@ -91,7 +91,7 @@ fn infer_from(
                 } else if stem == "link" || stem == "lld-link" {
                     LinkerFlavor::Msvc
                 } else if stem == "lld" || stem == "rust-lld" {
-                    LinkerFlavor::Lld(sess.target.options.lld_flavor)
+                    LinkerFlavor::Lld(sess.target.lld_flavor)
                 } else {
                     // fall back to the value in the target spec
                     sess.target.linker_flavor
@@ -115,7 +115,7 @@ fn infer_from(
 
     if let Some(ret) = infer_from(
         sess,
-        sess.target.options.linker.clone().map(PathBuf::from),
+        sess.target.linker.clone().map(PathBuf::from),
         Some(sess.target.linker_flavor),
     ) {
         return ret;