From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 5 Jul 2018 04:10:10 +0000 (-0500)
Subject: in the second copy lld is already named rust-lld
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=31ed5c7a01d9826c10bdd166ffcd23efd95b1efe;p=rust.git

in the second copy lld is already named rust-lld
---

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 @@ fn prepare_image(builder: &Builder, compiler: Compiler, image: &Path) {
 
             // 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);
             }