Merge commit '15c8d31392b9fbab3b3368b67acc4bbe5983115a' into cranelift-rebase

[rust.git] / src / toolchain.rs

diff --git a/src/toolchain.rs b/src/toolchain.rs
index 2a31b8834384b97896e86ac11280478f9373b6ac..484a9b699a0aa41aa73c412610bae16e2155d456 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;
@@ -7,9 +9,10 @@
 /// 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);
-    let linker_file_name = linker.file_name().and_then(|name| name.to_str()).unwrap_or_else(|| {
-        sess.fatal("couldn't extract file name from specified linker")
-    });
+    let linker_file_name = linker
+        .file_name()
+        .and_then(|name| name.to_str())
+        .unwrap_or_else(|| sess.fatal("couldn't extract file name from specified linker"));
 
     if linker_file_name == "ld.lld" {
         if tool != "ld" {
@@ -85,10 +88,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))
@@ -105,8 +108,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;
     }