about summary refs log tree commit diff
diff options
context:
space:
mode:
author1000teslas <47207223+1000teslas@users.noreply.github.com>2021-06-13 21:45:22 +1000
committer1000teslas <47207223+1000teslas@users.noreply.github.com>2021-06-30 16:30:40 +1000
commitfe822fe64dacc7e73b0b7e0bf1306b3b652bcc0e (patch)
tree95c4160d7683ca6401f3827f7b7525d05685f90c
parent9af4bdeab0d971d61ea59a02923944fc80daafcc (diff)
downloadrust-fe822fe64dacc7e73b0b7e0bf1306b3b652bcc0e.tar.gz
rust-fe822fe64dacc7e73b0b7e0bf1306b3b652bcc0e.zip
copy rust-lld as ld in dist
-rw-r--r--src/bootstrap/dist.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 19895baf08f..92853378e58 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -400,12 +400,12 @@ impl Step for Rustc {
 
             // Copy over lld if it's there
             if builder.config.lld_enabled {
-                let exe = exe("rust-lld", compiler.host);
-                builder.copy(&src_dir.join(&exe), &dst_dir.join(&exe));
+                let rust_lld = exe("rust-lld", compiler.host);
+                builder.copy(&src_dir.join(&rust_lld), &dst_dir.join(&rust_lld));
                 // for `-Z gcc-ld=lld`
                 let gcc_lld_dir = dst_dir.join("gcc-ld");
                 t!(fs::create_dir(&gcc_lld_dir));
-                builder.copy(&src_dir.join(&exe), &gcc_lld_dir.join(&exe));
+                builder.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld", compiler.host)));
             }
 
             // Copy over llvm-dwp if it's there