Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-21 17:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

in the second copy lld is already named rust-lld

Browse Source
This commit is contained in:
Jorge Aparicio
2018-07-04 23:10:10 -05:00
parent 807cd36381
commit 31ed5c7a01
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootstrap/dist.rs
+3 -4
View File
@@ -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);
}