Skip to content

Commit 7cd6174

Browse files
authored
Rollup merge of rust-lang#99128 - oxalica:fix/ci-llvm-patchelf, r=jyn514
Fix `download-ci-llvm` NixOS patching for binaries LLVM tools should also be patched, since they are used in some tests, specially, - src/test/run-make-fulldeps/cross-lang-lto (llvm-ar) - src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs (llvm-ar) - src/test/run-make-fulldeps/issue-64153 (llvm-objdump) To be more future proof, we should patch all binaries in `bin`, which is done in this PR.
2 parents 582bec4 + 6245d72 commit 7cd6174

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: src/bootstrap/native.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ pub(crate) fn maybe_download_ci_llvm(builder: &Builder<'_>) {
147147
let key = format!("{}{}", llvm_sha, config.llvm_assertions);
148148
if program_out_of_date(&llvm_stamp, &key) && !config.dry_run {
149149
download_ci_llvm(builder, &llvm_sha);
150-
for binary in ["llvm-config", "FileCheck"] {
151-
builder.fix_bin_or_dylib(&llvm_root.join("bin").join(binary));
150+
for entry in t!(fs::read_dir(llvm_root.join("bin"))) {
151+
builder.fix_bin_or_dylib(&t!(entry).path());
152152
}
153153

154154
// Update the timestamp of llvm-config to force rustc_llvm to be

0 commit comments

Comments
 (0)