diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2021-11-25 11:45:58 -0600 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2021-12-04 17:00:29 -0500 |
| commit | 7826c57be6ce056ec12faff7f68c980a2d18ea48 (patch) | |
| tree | 976e9332626a8780a345648f71510aa1b698fa2c /src/bootstrap | |
| parent | ff23ad3179014ba258f2b540fb39dd0f26852b7a (diff) | |
| download | rust-7826c57be6ce056ec12faff7f68c980a2d18ea48.tar.gz rust-7826c57be6ce056ec12faff7f68c980a2d18ea48.zip | |
Include `lld` in `rust-dev` package
Fixes #88941 This will allow using `download-ci-llvm` while still having LLD available.
Diffstat (limited to 'src/bootstrap')
| -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 |
