Skip to content

Fix download-ci-llvm NixOS patching for binaries#99128

Merged
bors merged 1 commit intorust-lang:masterfrom
oxalica:fix/ci-llvm-patchelf
Jul 11, 2022
Merged

Fix download-ci-llvm NixOS patching for binaries#99128
bors merged 1 commit intorust-lang:masterfrom
oxalica:fix/ci-llvm-patchelf

Conversation

@oxalica
Copy link
Contributor

@oxalica oxalica commented Jul 10, 2022

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.

@oxalica
Fix download-ci-llvm NixOS patching for binaries
6245d72 
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`.
@rust-highfive
Copy link
Contributor

rust-highfive commented Jul 10, 2022

r? @jyn514

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2022
@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 10, 2022
jyn514
jyn514 approved these changes Jul 10, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems reasonable. I'm surprised it wasn't an issue until now ... the code for this moved from python to rust recently, maybe that affected things? but the old python code special cased these two binaries also ...

rust/src/bootstrap/bootstrap.py

Lines 531 to 532 in 9a2d14c

for binary in ["llvm-config", "FileCheck"]:
self.fix_bin_or_dylib(os.path.join(llvm_root, "bin", binary))

anyway, this LGTM

@jyn514
Copy link
Member

jyn514 commented Jul 10, 2022

@bors r+ rollup (no NixOS CI runners)

@bors
Copy link
Collaborator

bors commented Jul 10, 2022

📌 Commit 6245d72 has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 10, 2022
@oxalica
Copy link
Contributor Author

oxalica commented Jul 10, 2022

@jyn514

but the old python code special cased these two binaries also ...

rust/src/bootstrap/bootstrap.py

Lines 531 to 532 in 9a2d14c

for binary in ["llvm-config", "FileCheck"]:
self.fix_bin_or_dylib(os.path.join(llvm_root, "bin", binary))

Is the python code still in use and need fixing? I'm not hitting that code with ./x.py test.

@matthiaskrgr matthiaskrgr mentioned this pull request Jul 10, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2022
@bors
Auto merge of rust-lang#99133 - matthiaskrgr:rollup-eignphd, r=matthi…
e1b348f 
…askrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#98713 (promote placeholder bounds to 'static obligations)
 - rust-lang#99094 (Remove extra space in AtomicPtr::new docs)
 - rust-lang#99095 (Remove duplicate notes from error on inter-crate ambiguous impl of traits)
 - rust-lang#99114 (Group .test-arrow CSS rules and fix rgb/rgba property)
 - rust-lang#99128 (Fix `download-ci-llvm` NixOS patching for binaries)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@jyn514
Copy link
Member

jyn514 commented Jul 10, 2022 •
edited
Loading

@oxalica no, the code lives fully in rust now. Just trying to figure out how long this has been an issue.

@bors bors merged commit 7cd6174 into rust-lang:master Jul 11, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 11, 2022
@oxalica oxalica deleted the fix/ci-llvm-patchelf branch July 11, 2022 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jyn514 jyn514 jyn514 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jyn514 jyn514

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.64.0

Development

Successfully merging this pull request may close these issues.

5 participants

@oxalica @rust-highfive @jyn514 @bors @rustbot