Flags from env variables like RUSTFLAGS now have precedence over bootstrap own flags and not the other way around.
#148911
+26
−15
Conversation
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
rustbot
added
S-waiting-on-review
karolzwolak
force-pushed
the
bootstrap-rustflags-precedence
branch
2 times, most recently
from
ce939ab to
456ce9a
Compare
Member
Author
This comment has been minimized.
This comment has been minimized.
…otstrap own flags and not the other way around.
karolzwolak
force-pushed
the
bootstrap-rustflags-precedence
branch
from
456ce9a to
e0750a1
Compare
Kobzol
reviewed
Nov 14, 2025
| // #71458. | ||
| let mut rustdocflags = rustflags.clone(); | ||
| rustdocflags.propagate_rustflag_envs(build_compiler_stage); | ||
| rustdocflags.propagate_cargo_env("RUSTDOCFLAGS"); |
Member
There was a problem hiding this comment.
To uphold the rule that RUSTDOCFLAGS have preference, the env. vars. for rustdocflags should be only propagated after bootstrap sets its flags, right? Near line 1360.
Actually, now that I think about it, the changes from this PR are not enough. Because after being created, the Cargo struct has a rustflag method, which is used in other places in bootstrap to configure additional flags.
So if we really want the external env. var. to override everything, we should only do the actual propagation in impl From<Cargo> for BootstrapCommand, where the rustflags are "materialized".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Before this PR extra flags from env variables like
RUSTFLAGShad lower precedence than bootstrap flags. This PR changes that, and tus makes overriding flags passed to the compiler easier and more reliable.This is technically a breaking change — but it only affects people using these env variables.
This change was discussed on zulip by members of bootstrap team.
To be exact these the following flags have their precedence increased:
r? @Kobzol