Skip to content

Actually take --build into account in bootstrap #142624

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Jun 18, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 17, 2025

I went back 20 stable versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).

I added destructuring of the flags to make sure that this doesn't happen again. It found one more duplicated CLI flag.

r? @jieyouxu

I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).
@rustbot
Copy link
Collaborator

rustbot commented Jun 17, 2025

jieyouxu is not on the review rotation at the moment.
They may take a while to respond.

@rustbot rustbot added 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 Jun 17, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 17, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, one comment nit, r=me after

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 18, 2025
@Kobzol Kobzol force-pushed the bootstrap-fix-host branch from 1266cd3 to aeea2e5 Compare June 18, 2025 07:38
@jieyouxu jieyouxu added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 18, 2025
@jieyouxu
Copy link
Member

Kewl
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 18, 2025

📌 Commit aeea2e5 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 18, 2025
Kobzol added a commit to Kobzol/rust that referenced this pull request Jun 18, 2025
Actually take `--build` into account in bootstrap

I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).

I added destructuring of the flags to make sure that this doesn't happen again. It found one more duplicated CLI flag.

r? `@jieyouxu`
bors added a commit that referenced this pull request Jun 18, 2025
Rollup of 12 pull requests

Successful merges:

 - #135656 (Add `-Z hint-mostly-unused` to tell rustc that most of a crate will go unused)
 - #140774 (Affirm `-Cforce-frame-pointers=off` does not override)
 - #141610 (Stabilize `feature(generic_arg_infer)`)
 - #142123 (Implement initial support for timing sections (`--json=timings`))
 - #142383 (CodeGen: rework Aggregate implemention for rvalue_creates_operand cases)
 - #142502 (rustdoc_json: improve handling of generic args)
 - #142591 (Add spawn APIs for BootstrapCommand to support deferred command execution)
 - #142606 (AsyncDrop trait without sync Drop generates an error)
 - #142619 (apply clippy::or_fun_call)
 - #142624 (Actually take `--build` into account in bootstrap)
 - #142627 (Add `StepMetadata` to describe steps)
 - #142660 (remove joboet from review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol added a commit to Kobzol/rust that referenced this pull request Jun 18, 2025
Actually take `--build` into account in bootstrap

I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).

I added destructuring of the flags to make sure that this doesn't happen again. It found one more duplicated CLI flag.

r? ``@jieyouxu``
bors added a commit that referenced this pull request Jun 18, 2025
Rollup of 11 pull requests

Successful merges:

 - #140774 (Affirm `-Cforce-frame-pointers=off` does not override)
 - #141610 (Stabilize `feature(generic_arg_infer)`)
 - #142383 (CodeGen: rework Aggregate implemention for rvalue_creates_operand cases)
 - #142591 (Add spawn APIs for BootstrapCommand to support deferred command execution)
 - #142619 (apply clippy::or_fun_call)
 - #142624 (Actually take `--build` into account in bootstrap)
 - #142627 (Add `StepMetadata` to describe steps)
 - #142660 (remove joboet from review rotation)
 - #142666 (Skip tidy triagebot linkcheck if `triagebot.toml` doesn't exist)
 - #142672 (Clarify bootstrap tools description)
 - #142674 (remove duplicate crash test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7b53cc0 into rust-lang:master Jun 18, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 18, 2025
rust-timer added a commit that referenced this pull request Jun 18, 2025
Rollup merge of #142624 - Kobzol:bootstrap-fix-host, r=jieyouxu

Actually take `--build` into account in bootstrap

I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).

I added destructuring of the flags to make sure that this doesn't happen again. It found one more duplicated CLI flag.

r? ```@jieyouxu```
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 19, 2025
Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#140774 (Affirm `-Cforce-frame-pointers=off` does not override)
 - rust-lang/rust#141610 (Stabilize `feature(generic_arg_infer)`)
 - rust-lang/rust#142383 (CodeGen: rework Aggregate implemention for rvalue_creates_operand cases)
 - rust-lang/rust#142591 (Add spawn APIs for BootstrapCommand to support deferred command execution)
 - rust-lang/rust#142619 (apply clippy::or_fun_call)
 - rust-lang/rust#142624 (Actually take `--build` into account in bootstrap)
 - rust-lang/rust#142627 (Add `StepMetadata` to describe steps)
 - rust-lang/rust#142660 (remove joboet from review rotation)
 - rust-lang/rust#142666 (Skip tidy triagebot linkcheck if `triagebot.toml` doesn't exist)
 - rust-lang/rust#142672 (Clarify bootstrap tools description)
 - rust-lang/rust#142674 (remove duplicate crash test)

r? `@ghost`
`@rustbot` modify labels: rollup
@Kobzol Kobzol deleted the bootstrap-fix-host branch June 19, 2025 04:39
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

4 participants