Rollup merge of #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.
This commit is contained in:
commit
7cd617490d
@ -147,8 +147,8 @@ pub(crate) fn maybe_download_ci_llvm(builder: &Builder<'_>) {
|
||||
let key = format!("{}{}", llvm_sha, config.llvm_assertions);
|
||||
if program_out_of_date(&llvm_stamp, &key) && !config.dry_run {
|
||||
download_ci_llvm(builder, &llvm_sha);
|
||||
for binary in ["llvm-config", "FileCheck"] {
|
||||
builder.fix_bin_or_dylib(&llvm_root.join("bin").join(binary));
|
||||
for entry in t!(fs::read_dir(llvm_root.join("bin"))) {
|
||||
builder.fix_bin_or_dylib(&t!(entry).path());
|
||||
}
|
||||
|
||||
// Update the timestamp of llvm-config to force rustc_llvm to be
|
||||
|
Loading…
x
Reference in New Issue
Block a user