Skip to content

Commit 6c189bc

Browse files
committed
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.
2 parents bdaa901 + 7826c57 commit 6c189bc

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/bootstrap/dist.rs

+7
Original file line numberDiff line numberDiff line change
@@ -2085,6 +2085,13 @@ impl Step for RustDev {
20852085
] {
20862086
tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755);
20872087
}
2088+
2089+
// We don't build LLD on some platforms, so only add it if it exists
2090+
let lld_path = builder.lld_out(target).join("bin").join(exe("lld", target));
2091+
if lld_path.exists() {
2092+
tarball.add_file(lld_path, "bin", 0o755);
2093+
}
2094+
20882095
tarball.add_file(&builder.llvm_filecheck(target), "bin", 0o755);
20892096

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

0 commit comments

Comments
 (0)