Skip to content

Commit 31ed5c7

Browse files
committed
in the second copy lld is already named rust-lld
1 parent 807cd36 commit 31ed5c7

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/bootstrap/dist.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -491,18 +491,17 @@ impl Step for Rustc {
491491

492492
// Copy over lld if it's there
493493
if builder.config.lld_enabled {
494-
let src_exe = exe("lld", &compiler.host);
495-
let dst_exe = exe("rust-lld", &compiler.host);
494+
let exe = exe("rust-lld", &compiler.host);
496495
let src = builder.sysroot_libdir(compiler, host)
497496
.parent()
498497
.unwrap()
499498
.join("bin")
500-
.join(&src_exe);
499+
.join(&exe);
501500
// for the rationale about this rename check `compile::copy_lld_to_sysroot`
502501
let dst = image.join("lib/rustlib")
503502
.join(&*host)
504503
.join("bin")
505-
.join(&dst_exe);
504+
.join(&exe);
506505
t!(fs::create_dir_all(&dst.parent().unwrap()));
507506
builder.copy(&src, &dst);
508507
}

0 commit comments

Comments
 (0)