squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Include lld in rust-dev package

Browse source 
Fixes #88941

This will allow using `download-ci-llvm` while still having LLD
available.
This commit is contained in:
Aaron Hill 2021-11-25 11:45:58 -06:00
parent ff23ad3179
commit 7826c57be6
No known key found for this signature in database
GPG key ID: B4087E510E98B164
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