Change flag ordering #1403
Open
Change flag ordering #1403
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
To allow flags set on the builder to override other flags, and to allow CFLAGS to override _all_ other flags.
madsmtm
force-pushed
the
flag-ordering
branch
from
ad73f8b to
7a651f7
Compare
NobodyXu
requested changes
Feb 15, 2025
Comment on lines
+1926
to
1934
| // Specify various flags that are not considered part of the default flags above. | ||
| // FIXME(madsmtm): Should these be considered part of the defaults? If no, why not? | ||
| if let Some(ref std) = self.std { | ||
| let separator = match cmd.family { | ||
| ToolFamily::Msvc { .. } => ':', | ||
| ToolFamily::Gnu | ToolFamily::Clang { .. } => '=', | ||
| }; | ||
| cmd.push_cc_arg(format!("-std{}{}", separator, std).into()); | ||
| } |
There was a problem hiding this comment.
I think this is Builder flags, std version is specified in Builder
Comment on lines
+29
to
+30
| // FIXME(madsmtm): Re-enable once `is_flag_supported` works in CI regardless of `target`. | ||
| // unsafe { std::env::set_var("CARGO_ENCODED_RUSTFLAGS", "-Cdwarf-version=5") }; |
There was a problem hiding this comment.
Is there another issue/PR for this?
Comment on lines
+50
to
+56
| .must_have_in_order("-static", "-Lbuilder-flag1") | ||
| .must_have_in_order("-Lbuilder-flag1", "-Lbuilder-flag2") | ||
| .must_have_in_order("-Lbuilder-flag2", "-Larbitrary1") | ||
| .must_have_in_order("-Larbitrary1", "-Larbitrary2") | ||
| .must_have_in_order("-Larbitrary1", "-Larbitrary2") | ||
| .must_have_in_order("-Larbitrary2", "-Larbitrary3") | ||
| .must_have_in_order("-Larbitrary3", "-Larbitrary4"); |
There was a problem hiding this comment.
Nit: maybe we could access .args directly?
Line 20 in 0dd683c
Suggested change
| .must_have_in_order("-static", "-Lbuilder-flag1") | |
| .must_have_in_order("-Lbuilder-flag1", "-Lbuilder-flag2") | |
| .must_have_in_order("-Lbuilder-flag2", "-Larbitrary1") | |
| .must_have_in_order("-Larbitrary1", "-Larbitrary2") | |
| .must_have_in_order("-Larbitrary1", "-Larbitrary2") | |
| .must_have_in_order("-Larbitrary2", "-Larbitrary3") | |
| .must_have_in_order("-Larbitrary3", "-Larbitrary4"); | |
| .args == [ | |
| "-static", | |
| "-Lbuilder-flag1", | |
| "-Lbuilder-flag2", | |
| "-Larbitrary1", | |
| "-Larbitrary2", | |
| "-Larbitrary3", | |
| "-Larbitrary4", | |
| ] |
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.
To allow flags set on the builder with
Build::flag/Build::flag_if_supportedto override other flags, and to allowCFLAGSto override all other flags.Found while doing #1401.
Now the order of flags are as follows, with later flags overriding previous ones. I've also here shown who "controls" which flag, to make it clear why we want the ordering to be like this.
cc-rs.rustc-inherited flagsrustc.cc-rsin e.g. theirbuild.rs.