Fix LLVM rebuild with download-ci-llvm. #98513
Merged
Conversation
This file contains 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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup Thanks for the investigation -- I agree this is a partial, but OK fix for now. |
|
📌 Commit 418b1fa has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 26, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#98371 (Fix printing `impl trait` under binders) - rust-lang#98385 (Work around llvm 12's memory ordering restrictions.) - rust-lang#98474 (x.py: Support systems with only `python3` not `python`) - rust-lang#98488 (Bump RLS to latest master on rust-lang/rls) - rust-lang#98491 (Fix backtrace UI test when panic=abort is used) - rust-lang#98502 (Fix source sidebar hover in ayu theme) - rust-lang#98509 (diagnostics: consider parameter count when suggesting smart pointers) - rust-lang#98513 (Fix LLVM rebuild with download-ci-llvm.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
This fixes an issue where updating a local checkout that includes a change in
src/versioncauses a linking failure.The cause is that the
rustc_llvmbuild script usesrerun-if-changedofllvm-configto know if it needs to rerun. Cargo only compares the timestamp of the last time the build script to the file. However, extracting the tar files retains the timestamps in the tarball which may be some time in the past. Sincesrc/versionis included in the LLVM.sofilename,rustcattempts to load the wrong shared library since therustc_llvmbuild script doesn't rerun.rust-lang/cargo#10791 contains a more detailed explanation.
The solution here is a hack which updates the timestamp of
llvm-configto the current time when it is extracted.This is a bit of a hack, but seems to be the best solution I can think of until rust-lang/cargo#10791 is fixed. There are likely several other situations where this is a problem (such as using system LLVM), and this isn't really a complete fix.
Note that apple platforms are not directly affected by this problem because they don't have a version in the dylib filename.
How to test this:
./x.py build library/std./x.py build library/stdFixes #98495