diff options
| author | bors <bors@rust-lang.org> | 2021-12-05 06:46:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-05 06:46:58 +0000 |
| commit | 6c189bc9c20f501819c67e40b980e287c7e24d10 (patch) | |
| tree | ea93df4b4e95b00001445cbbbb68aaf2502ea363 | |
| parent | bdaa9010493d26611079a9de1c8722532e140a24 (diff) | |
| parent | 7826c57be6ce056ec12faff7f68c980a2d18ea48 (diff) | |
| download | rust-6c189bc9c20f501819c67e40b980e287c7e24d10.tar.gz rust-6c189bc9c20f501819c67e40b980e287c7e24d10.zip | |
Auto merge of #91229 - Aaron1011:dist-lld, r=Mark-Simulacrum
Include `lld` in `rust-dev` package Fixes #88941 This will allow using `download-ci-llvm` while still having LLD available.
| -rw-r--r-- | src/bootstrap/dist.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 09ea84a083e..5f28ffeda8f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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 |