Add some comments

diff --git a/config.toml.example b/config.toml.example
index c8aff4af8ffe3114b6604db92ae879e31013f4cd..632b09b92bd7cfd8328849730ee8379bb1fe4638 100644 (file)
--- 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 189f9e6ccab427ee68757c22831a6c156dccecae..24b679d07cc9d8e89a5373d3ab88bc5f2dcc017a 100644 (file)
--- 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);
         }