Add LLD flags to rustdoc cargo invocations

Author: Kobzol

src/bootstrap/test.rs

@@ -28,8 +28,8 @@ use crate::synthetic_targets::MirOptPanicAbortSyntheticTarget;
 use crate::tool::{self, SourceType, Tool};
 use crate::toolstate::ToolState;
 use crate::util::{
-    self, add_link_lib_path, add_rustdoc_lld_flags, dylib_path, dylib_path_var, output, t,
-    up_to_date,
+    self, add_link_lib_path, add_rustdoc_cargo_lld_flags, add_rustdoc_lld_flags, dylib_path,
+    dylib_path_var, output, t, up_to_date,
 };
 use crate::{envify, CLang, DocTests, GitRepo, Mode};
 
@@ -265,13 +265,14 @@ impl Step for Cargotest {
 
         let _time = util::timeit(&builder);
         let mut cmd = builder.tool_cmd(Tool::CargoTest);
-        builder.run_delaying_failure(
-            cmd.arg(&cargo)
-                .arg(&out_dir)
-                .args(builder.config.test_args())
-                .env("RUSTC", builder.rustc(compiler))
-                .env("RUSTDOC", builder.rustdoc(compiler)),
-        );
+        let mut cmd = cmd
+            .arg(&cargo)
+            .arg(&out_dir)
+            .args(builder.config.test_args())
+            .env("RUSTC", builder.rustc(compiler))
+            .env("RUSTDOC", builder.rustdoc(compiler));
+        add_rustdoc_cargo_lld_flags(&mut cmd, builder, compiler.host, true);
+        builder.run_delaying_failure(cmd);
     }
 }
 
@@ -1030,6 +1031,8 @@ impl Step for RustdocGUI {
         cmd.env("RUSTDOC", builder.rustdoc(self.compiler))
             .env("RUSTC", builder.rustc(self.compiler));
 
+        add_rustdoc_cargo_lld_flags(&mut cmd, builder, self.compiler.host, true);
+
         for path in &builder.paths {
             if let Some(p) = util::is_valid_test_suite_arg(path, "tests/rustdoc-gui", builder) {
                 if !p.ends_with(".goml") {

src/bootstrap/util.rs

@@ -5,6 +5,7 @@
 
 use build_helper::util::{fail, try_run};
 use std::env;
+use std::ffi::{OsStr, OsString};
 use std::fs;
 use std::io;
 use std::path::{Path, PathBuf};
@@ -498,7 +499,7 @@ pub fn dir_is_empty(dir: &Path) -> bool {
 
 pub fn add_rustdoc_lld_flags(
     cmd: &mut Command,
-    builder: &Builder,
+    builder: &Builder<'_>,
     target: TargetSelection,
     single_threaded: bool,
 ) {
@@ -514,3 +515,41 @@ pub fn add_rustdoc_lld_flags(
         }
     }
 }
+
+pub fn add_rustdoc_cargo_lld_flags(
+    cmd: &mut Command,
+    builder: &Builder<'_>,
+    target: TargetSelection,
+    single_threaded: bool,
+) {
+    let mut args = vec![];
+
+    if let Some(linker) = builder.linker(target) {
+        let mut flag = std::ffi::OsString::from("-Clinker=");
+        flag.push(linker);
+        args.push(flag);
+    }
+    if builder.is_fuse_ld_lld(target) {
+        args.push(OsString::from("-Clink-arg=-fuse-ld=lld"));
+        if single_threaded {
+            args.push(OsString::from(format!(
+                "-Clink-arg=-Wl,{}",
+                lld_flag_no_threads(target.contains("windows"))
+            )));
+        }
+    }
+
+    let mut flags = cmd
+        .get_envs()
+        .find(|(k, _)| *k == OsStr::new("RUSTDOCFLAGS"))
+        .and_then(|(_, v)| v)
+        .unwrap_or(OsStr::new(""))
+        .to_os_string();
+    for arg in args {
+        if !flags.is_empty() {
+            flags.push(" ");
+        }
+        flags.push(arg);
+    }
+    cmd.env("RUSTDOCFLAGS", flags);
+}