Slightly refactor TargetSelection in bootstrap
#128983
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
the
S-waiting-on-review
|
This PR modifies If appropriate, please update |
rustbot
added
the
T-bootstrap
onur-ozkan
approved these changes
Aug 13, 2024
|
Feel free to r=me once rebased. |
Kobzol
force-pushed
the
bootstrap-target
branch
from
e1613ea to
1c0c2c3
Compare
|
@bors r=onur-ozkan |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#128643 (Refactor `powerpc64` call ABI handling) - rust-lang#128655 (std: refactor UNIX random data generation) - rust-lang#128745 (Remove unused lifetime parameter from spawn_unchecked) - rust-lang#128841 (bootstrap: don't use rustflags for `--rustc-args`) - rust-lang#128983 (Slightly refactor `TargetSelection` in bootstrap) - rust-lang#129026 (CFI: Move CFI ui tests to cfi directory) - rust-lang#129040 (Fix blessing of rmake tests) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 13, 2024
Rollup merge of rust-lang#128983 - Kobzol:bootstrap-target, r=onur-ozkan Slightly refactor `TargetSelection` in bootstrap Mostly a drive-by refactoring of `TargetSelection` to reduce some manual "windows-gnu" detection and also accesses to the `triple` field. r? `@onur-ozkan`
|
@Kobzol I stumbled upon this PR as it conflicted with my #128876 Looking more into it, we now join |
|
I tried to only replace situations where the target was joined as a path, so that the |
|
Oh, this one: 1c0c2c3#diff-11a177c4925352bc8852241c59fd49c369df531495f11f81914eb6972783bb8aR522 That's not great, I'll send a fix. Thank you! |
|
Fixed in #129056. Thanks! |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 13, 2024
…zkan Fix one usage of target triple in bootstrap This bug was introduced in rust-lang#128983. In this one case, the `TargetSelection` was also used as `Display` (not just as `Path`), which I did not notice in the original PR. If the target contained a custom file, it would be included in its `Display` formatting, even though only the triple should be used. Found [here](rust-lang#128983 (comment)). r? `@onur-ozkan`
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 14, 2024
Rollup merge of rust-lang#129056 - Kobzol:fix-target-triple, r=onur-ozkan Fix one usage of target triple in bootstrap This bug was introduced in rust-lang#128983. In this one case, the `TargetSelection` was also used as `Display` (not just as `Path`), which I did not notice in the original PR. If the target contained a custom file, it would be included in its `Display` formatting, even though only the triple should be used. Found [here](rust-lang#128983 (comment)). r? `@onur-ozkan`
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.
Mostly a drive-by refactoring of
TargetSelectionto reduce some manual "windows-gnu" detection and also accesses to thetriplefield.r? @onur-ozkan