Support download-ci-llvm on NixOS#80820
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 10, 2021
Merged
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors r+ Just "trusting" this to work - I presume you've tested locally or so. |
Collaborator
|
📌 Commit e8e1145e3d4bb444d77cc3918234d3931cc08f73 has been approved by |
Member
Author
|
@bors r- Still need to patchelf |
In particular, the CI built `libLLVM-*.so` needs to have `libz.so` RPATHed so that binaries like `llvm-config` work at all.
e8e1145 to
15ade4d
Compare
Member
Author
|
@bors r=Mark-Simulacrum |
Collaborator
|
📌 Commit 15ade4d has been approved by |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 10, 2021
…ulacrum Support `download-ci-llvm` on NixOS In particular, the CI built `libLLVM-*.so` needs to have `libz.so` RPATHed so that binaries like `llvm-config` work at all.
This was referenced Jan 10, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 10, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#79502 (Implement From<char> for u64 and u128.) - rust-lang#79968 (Improve core::ptr::drop_in_place debuginfo) - rust-lang#80774 (Fix safety comment) - rust-lang#80801 (Use correct span for structured suggestion) - rust-lang#80803 (Remove useless `fill_in` function) - rust-lang#80820 (Support `download-ci-llvm` on NixOS) - rust-lang#80825 (Remove under-used ImplPolarity enum) - rust-lang#80850 (Allow #[rustc_builtin_macro = "name"]) - rust-lang#80857 (Add comment to `Vec::truncate` explaining `>` vs `>=`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In particular, the CI built
libLLVM-*.soneeds to havelibz.soRPATHed so that binaries like
llvm-configwork at all.