From e763ddc6b9025482edd06ab563f8a3783381aae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Sun, 9 Feb 2020 14:26:13 +0100 Subject: [PATCH] Add some comments --- config.toml.example | 2 ++ src/bootstrap/test.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/config.toml.example b/config.toml.example index c8aff4af8ff..632b09b92bd 100644 --- a/config.toml.example +++ b/config.toml.example @@ -398,6 +398,8 @@ # Indicates whether LLD will be used to link Rust crates during bootstrap on # supported platforms. The LLD from the bootstrap distribution will be used # and not the LLD compiled during the bootstrap. +# +# LLD will not be used if we're cross linking or running tests. #use-lld = false # Indicates whether some LLVM tools, like llvm-objdump, will be made available in the diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 189f9e6ccab..24b679d07cc 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1035,6 +1035,7 @@ fn run(self, builder: &Builder<'_>) { flags.push("-Zunstable-options".to_string()); flags.push(builder.config.cmd.rustc_args().join(" ")); + // Don't use LLD here since we want to test that rustc finds and uses a linker by itself. if let Some(linker) = builder.linker(target, false) { cmd.arg("--linker").arg(linker); }