nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #91229 - Aaron1011:dist-lld, r=Mark-Simulacrum

Browse Source 
Include `lld` in `rust-dev` package

Fixes #88941

This will allow using `download-ci-llvm` while still having LLD
available.
This commit is contained in:
bors 2021-12-05 06:46:58 +00:00
commit 6c189bc9c2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/dist.rs
View File

@ -2085,6 +2085,13 @@ impl Step for RustDev {
] { ] {
tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755); 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); tarball.add_file(&builder.llvm_filecheck(target), "bin", 0o755);
// Copy the include directory as well; needed mostly to build // Copy the include directory as well; needed mostly to build