about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJorge Aparicio <jorge@japaric.io>2018-07-04 23:10:10 -0500
committerJorge Aparicio <jorge@japaric.io>2018-07-04 23:10:10 -0500
commit31ed5c7a01d9826c10bdd166ffcd23efd95b1efe (patch)
tree0bdce319765988bca4dddb04575f68476b231285 /src/bootstrap
parent807cd3638192a86e51c9bd0018144d32214f2b9d (diff)
downloadrust-31ed5c7a01d9826c10bdd166ffcd23efd95b1efe.tar.gz
rust-31ed5c7a01d9826c10bdd166ffcd23efd95b1efe.zip
in the second copy lld is already named rust-lld
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/dist.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index c61f360544f..381e4beec4d 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -491,18 +491,17 @@ impl Step for Rustc {
 
             // Copy over lld if it's there
             if builder.config.lld_enabled {
-                let src_exe = exe("lld", &compiler.host);
-                let dst_exe = exe("rust-lld", &compiler.host);
+                let exe = exe("rust-lld", &compiler.host);
                 let src = builder.sysroot_libdir(compiler, host)
                     .parent()
                     .unwrap()
                     .join("bin")
-                    .join(&src_exe);
+                    .join(&exe);
                 // for the rationale about this rename check `compile::copy_lld_to_sysroot`
                 let dst = image.join("lib/rustlib")
                     .join(&*host)
                     .join("bin")
-                    .join(&dst_exe);
+                    .join(&exe);
                 t!(fs::create_dir_all(&dst.parent().unwrap()));
                 builder.copy(&src, &dst);
             }