[Bootstrap] Pass exact CI llvm-config executable path - #161598
Open
jieyouxu wants to merge 1 commit into
Open
Conversation
Otherwise, this will cause `rustc_llvm` build script to consider the `llvm-config` executable missing, causing cargo build cache invalidation.
Collaborator
|
This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp. |
rustbot
added
S-waiting-on-review
Collaborator
|
|
jieyouxu
changed the title
llvm-config executable pathllvm-config executable path
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 23, 2026
…-llvm-config, r=Kobzol [Bootstrap] Pass exact CI `llvm-config` executable path ## Summary Follow-up fix for rust-lang#160916. I noticed that against latest `main` we are repeatedly invalidating `rustc_llvm`'s build script after ``` Fresh ar_archive_writer v0.5.3 Dirty rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm): the file `build\x86_64-pc-windows-msvc\ci-llvm\bin\llvm-config` is missing Compiling rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm) Fresh unicode-security **v0.1.2** ``` This PR passes the *exact* CI LLVM `llvm-config` executable path (including the `.exe` extension on Windows). Otherwise, this will cause `rustc_llvm` build script to consider the `llvm-config` executable missing, causing cargo build cache invalidation. I tested this locally and this seems to fix the invalidation w/ CI LLVM. r? Kobzol
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 23, 2026
…uwer Rollup of 9 pull requests Successful merges: - #160302 (target_features: sse (or at least avx2) is incompatible with soft-float ABI) - #161586 (miri subtree update) - #155254 (Recover on attribute in use tree) - #161166 (add crashtests [5/N], remove unused aux files ) - #161294 (add crashtests [6/N]) - #161569 (Bump cfg_aliases to 0.2.2) - #161573 (re-bless `pretty-std` on windows) - #161588 (update eyre) - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 23, 2026
…-llvm-config, r=Kobzol [Bootstrap] Pass exact CI `llvm-config` executable path ## Summary Follow-up fix for rust-lang#160916. I noticed that against latest `main` we are repeatedly invalidating `rustc_llvm`'s build script after ``` Fresh ar_archive_writer v0.5.3 Dirty rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm): the file `build\x86_64-pc-windows-msvc\ci-llvm\bin\llvm-config` is missing Compiling rustc_llvm v0.0.0 (X:\repos\rust\compiler\rustc_llvm) Fresh unicode-security **v0.1.2** ``` This PR passes the *exact* CI LLVM `llvm-config` executable path (including the `.exe` extension on Windows). Otherwise, this will cause `rustc_llvm` build script to consider the `llvm-config` executable missing, causing cargo build cache invalidation. I tested this locally and this seems to fix the invalidation w/ CI LLVM. r? Kobzol
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 23, 2026
…uwer Rollup of 14 pull requests Successful merges: - #160302 (target_features: sse (or at least avx2) is incompatible with soft-float ABI) - #161187 (add `Complex<T>` layout tests for straightforward targets) - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`) - #161586 (miri subtree update) - #155254 (Recover on attribute in use tree) - #158695 (Replace `CrateDump` with the Debug impl from `CStore`) - #160452 (-Ctarget-feature is not unsafe (any more)) - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios") - #161166 (add crashtests [5/N], remove unused aux files ) - #161569 (Bump cfg_aliases to 0.2.2) - #161573 (re-bless `pretty-std` on windows) - #161588 (update eyre) - #161589 (std: reduce visibility of some internal OsStr related types) - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
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
3 participants
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.
Summary
Follow-up fix for #160916.
I noticed that against latest
mainwe are repeatedly invalidatingrustc_llvm's build script afterThis PR passes the exact CI LLVM
llvm-configexecutable path (including the.exeextension on Windows). Otherwise, this will causerustc_llvmbuild script to consider thellvm-configexecutable missing, causing cargo build cache invalidation.I tested this locally and this seems to fix the invalidation w/ CI LLVM.
r? Kobzol