Fix rustc-args passing issue in bootstrap #113948
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
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 22, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#112508 (Tweak spans for self arg, fix borrow suggestion for signature mismatch) - rust-lang#113901 (Get rid of subst-relate incompleteness in new solver) - rust-lang#113948 (Fix rustc-args passing issue in bootstrap) - rust-lang#113950 (Remove Scope::Elision from bound-vars resolution.) - rust-lang#113957 (Add regression test for issue rust-lang#113941 - naive layout isn't refined) - rust-lang#113959 (Migrate GUI colors test to original CSS color format) r? `@ghost` `@rustbot` modify labels: rollup
RalfJung
reviewed
Jan 4, 2024
| self.config.cmd.rustc_args().iter().map(|s| s.to_string()).collect::<Vec<_>>(); | ||
| if !rustc_args.is_empty() { | ||
| cargo.env("RUSTFLAGS", &rustc_args.join(" ")); | ||
| } |
There was a problem hiding this comment.
I don't understand this patch, it doesn't make sense to me. This is setting the RUSTFLAGS env var, but when this Cargo instance is later turned into a Command, the RUSTFLAGS env var is anyway overwritten again:
rust/src/bootstrap/src/core/builder.rs
Lines 2414 to 2418 in c350d3c
There was a problem hiding this comment.
Shouldn't this be added to rustflags instead?
There was a problem hiding this comment.
Also the --help text says this should only be passed when running tests; I don't see that reflected in the code.
There was a problem hiding this comment.
Yeah, this isn't correct and fixed in #123489.
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.
Fixes #113178, r? @jyn514