Skip to content

Assorted bootstrap LLVM refactors (part 3/N) - #161247

Open
Kobzol wants to merge 2 commits into
rust-lang:mainfrom
Kobzol:bootstrap-llvm-3
Open

Assorted bootstrap LLVM refactors (part 3/N)#161247
Kobzol wants to merge 2 commits into
rust-lang:mainfrom
Kobzol:bootstrap-llvm-3

Conversation

@Kobzol

@Kobzol Kobzol commented Aug 17, 2026

Copy link
Copy Markdown
Member

Continuation of #160916.

This PR removes the llvm_out function, and makes it explicit when we need to build the host LLVM.

Before, bootstrap used to just arbitrarily run a llvm-config binary, even though it might not have been executable on the given host. Now, if we need to execute it, the host LLVM will always be explicitly built. It is possible that there are some cases where this will build LLVM where it didn't before, but that should only happen if you were on a target A, built LLVM for target B, and by sheer luck A could execute code for B (where A != B).
In any case, it is now explicit, so if we encounter such situation, we can fix it without depending on implicit assumptions (well, there are still thousands of other assumptions, but you get my point).

After this, I'll work on centralizing the sanity checking of downloading LLVM inside the LlvmFromCi step, which will allow us to log the exact reason why download-ci-llvm might not have been applied, and also enable downloading LLVM from CI for non-host targets.

r? jieyouxu

@rustbot

rustbot commented Aug 17, 2026

Copy link
Copy Markdown
Collaborator

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 17, 2026
@rustbot

rustbot commented Aug 17, 2026

Copy link
Copy Markdown
Collaborator

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

Comment thread src/bootstrap/src/core/builder/mod.rs Outdated
@rust-log-analyzer

This comment has been minimized.

And explicitly depend on building the host LLVM when we need to invoke its `llvm-config` binary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants