Skip to content

Commit

Permalink
Auto merge of #91229 - Aaron1011:dist-lld, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Include `lld` in `rust-dev` package

Fixes #88941

This will allow using `download-ci-llvm` while still having LLD
available.
  • Loading branch information
bors committed Dec 5, 2021
2 parents bdaa901 + 7826c57 commit 6c189bc
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,13 @@ impl Step for RustDev {
] {
tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755);
}

// We don't build LLD on some platforms, so only add it if it exists
let lld_path = builder.lld_out(target).join("bin").join(exe("lld", target));
if lld_path.exists() {
tarball.add_file(lld_path, "bin", 0o755);
}

tarball.add_file(&builder.llvm_filecheck(target), "bin", 0o755);

// Copy the include directory as well; needed mostly to build
Expand Down

0 comments on commit 6c189bc

Please sign in to comment.