bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds #69397
Conversation
The custom LLVM version suffix was introduced to avoid unintentional library names conflicts. By default it included the LLVM submodule commit hash. Changing the version suffix requires the complete LLVM rebuild, and since then every change to the submodules required it as well. Remove the commit hash from version suffix to avoid complete rebuilds, while leaving the `rust` string, the release number and release channel to disambiguate the library name.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit 598b187 has been approved by |
bors
added
S-waiting-on-bors
|
r? @nagisa |
Rollup of 7 pull requests Successful merges: - #69397 (bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds) - #69549 (Improve MinGW detection when cross compiling ) - #69562 (Don't `bug` when taking discriminant of generator during dataflow) - #69579 (parser: Remove `Parser::prev_span`) - #69580 (use .copied() instead of .map(|x| *x) on iterators) - #69583 (Do not ICE on invalid type node after parse recovery) - #69605 (Use `opt_def_id()` over `def_id()`) Failed merges: r? @ghost
I am still seeing full rebuilds. Looks like this did not help? |
|
It did help to me, e.g. the recent LLVM update (#70582), caused a very limited rebuild. |
|
With changes here, there should be a rebuild whenever release number changes. This still could be problematic when working with multiple branches. We could get rid of version completely on dev channel (@RalfJung you could try configuring it manually in config.toml and see if this is the issue). |
|
I just got a full rebuild from a pull that just skipped a few days (so, probably #70582). Not sure what I should configure manually? |
|
|
|
On the next LLVM bump I am now seeing a partial rebuild, so the previous one I saw was probably a one-off hickup. Thanks! |
The custom LLVM version suffix was introduced to avoid unintentional
library names conflicts. By default it included the LLVM submodule
commit hash. Changing the version suffix requires the complete LLVM
rebuild, and since then every change to the submodules required it as
well.
Remove the commit hash from version suffix to avoid complete rebuilds,
while leaving the
ruststring, the release number and release channelto disambiguate the library name.
Context: version suffix was introduced by #59173 as solution to #59034.
Resolves #68715.