Add bootstrap option to compile a tool with features #142379

Stypox · 2025-06-11T19:55:25Z

Add an option to specify which features to build a tool with, e.g. it will be useful to build Miri with tracing enabled:

tool-config.miri.features = ["tracing"]

See this Zulip thread for the options considered. If the final decision will be different than what I wrote now, I will update the code as needed. The reason why the option is tool-config.miri.features instead of something like tool-features.miri is to possibly allow adding more tool-specific configurations in the future.

I didn't do any validation of the keys of the tool-config hashmap, since I saw that no validation is done on the tools hashset either.

I don't like much the fact that features can be chosen by various places of the codebase: Steps can have some fixed extra_features, prepare_tool_cargo will add features depending on some bootstrapping options, and the newly added option can also contribute features to tools. However I think it is out of scope of this PR to try to refactor all of that (if it even is refactorable), so I left a comment in the codebase explaining all of the sources of features I could find.

rustbot · 2025-06-11T19:55:30Z

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

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

This PR modifies bootstrap.example.toml.

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

jieyouxu · 2025-06-11T23:44:53Z

r? bootstrap

Kobzol

Thanks, this looks simple enough. With one caveat that I would rename it from tool-config to just tool. Basically anything in the bootstrap.toml file is a config option in one way or another, so it seems redundant.

src/bootstrap/src/core/config/config.rs

Stypox · 2025-06-12T12:01:40Z

@rustbot ready

Thanks for the review! I renamed to tool and added more docs

Kobzol · 2025-06-12T13:18:04Z

Thanks!

@bors r+ rollup

bors · 2025-06-12T13:18:07Z

📌 Commit 17f69bf has been approved by Kobzol

It is now in the queue for this repository.

Rollup of 10 pull requests Successful merges: - #134847 (Implement asymmetrical precedence for closures and jumps) - #141491 (Delegate `<CStr as Debug>` to `ByteStr`) - #141770 (Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code) - #142069 (Introduce `-Zmacro-stats`) - #142158 (Tracking the old name of renamed unstable library features) - #142221 ([AIX] strip underlying xcoff object) - #142340 (miri: we can use apfloat's mul_add now) - #142379 (Add bootstrap option to compile a tool with features) - #142410 (intrinsics: rename min_align_of to align_of) - #142413 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142379 - Stypox:bootstrap-tool-config, r=Kobzol Add bootstrap option to compile a tool with features Add an option to specify which features to build a tool with, e.g. it will be useful to build Miri with tracing enabled: ```toml tool-config.miri.features = ["tracing"] ``` See [this Zulip thread](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Passing.20--features.20to.20Miri.20build.20using.20.2E.2Fx.2Epy/with/523564773) for the options considered. If the final decision will be different than what I wrote now, I will update the code as needed. The reason why the option is `tool-config.miri.features` instead of something like `tool-features.miri` is to possibly allow adding more tool-specific configurations in the future. I didn't do any validation of the keys of the `tool-config` hashmap, since I saw that no validation is done on the `tools` hashset either. I don't like much the fact that features can be chosen by various places of the codebase: `Step`s can have some fixed `extra_features`, `prepare_tool_cargo` will add features depending on some bootstrapping options, and the newly added option can also contribute features to tools. However I think it is out of scope of this PR to try to refactor all of that (if it even is refactorable), so I left a comment in the codebase explaining all of the sources of features I could find.

Rollup of 10 pull requests Successful merges: - rust-lang/rust#134847 (Implement asymmetrical precedence for closures and jumps) - rust-lang/rust#141491 (Delegate `<CStr as Debug>` to `ByteStr`) - rust-lang/rust#141770 (Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code) - rust-lang/rust#142069 (Introduce `-Zmacro-stats`) - rust-lang/rust#142158 (Tracking the old name of renamed unstable library features) - rust-lang/rust#142221 ([AIX] strip underlying xcoff object) - rust-lang/rust#142340 (miri: we can use apfloat's mul_add now) - rust-lang/rust#142379 (Add bootstrap option to compile a tool with features) - rust-lang/rust#142410 (intrinsics: rename min_align_of to align_of) - rust-lang/rust#142413 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#134847 (Implement asymmetrical precedence for closures and jumps) - rust-lang#141491 (Delegate `<CStr as Debug>` to `ByteStr`) - rust-lang#141770 (Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code) - rust-lang#142069 (Introduce `-Zmacro-stats`) - rust-lang#142158 (Tracking the old name of renamed unstable library features) - rust-lang#142221 ([AIX] strip underlying xcoff object) - rust-lang#142340 (miri: we can use apfloat's mul_add now) - rust-lang#142379 (Add bootstrap option to compile a tool with features) - rust-lang#142410 (intrinsics: rename min_align_of to align_of) - rust-lang#142413 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…r=Kobzol Change bootstrap's `tool.TOOL_NAME.features` to work on any subcommand This is a followup to rust-lang#142379 to make the bootstrap option `tool.TOOL_NAME.features` work on any subcommand instead of just build (so also run/test/...). I also made the `TOOL_NAME` comparisons look at the tool path instead of the tool name to determine to which tool a `TOOL_NAME` refers to, so you can specify tools by path like in other places of the bootstrap (e.g. `tool."tools/miri".features`).

Rollup merge of #143733 - Stypox:bootstrap-tool-config-any, r=Kobzol Change bootstrap's `tool.TOOL_NAME.features` to work on any subcommand This is a followup to #142379 to make the bootstrap option `tool.TOOL_NAME.features` work on any subcommand instead of just build (so also run/test/...). I also made the `TOOL_NAME` comparisons look at the tool path instead of the tool name to determine to which tool a `TOOL_NAME` refers to, so you can specify tools by path like in other places of the bootstrap (e.g. `tool."tools/miri".features`).

Add bootstrap option to compile a tool with features

8dac423

This comment has been minimized.

Sign in to view

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 11, 2025

rustbot assigned Kobzol Jun 11, 2025

Kobzol reviewed Jun 12, 2025

View reviewed changes

src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved

Rename tool-config to tool and add docs

17f69bf

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 12, 2025

Stypox mentioned this pull request Jun 12, 2025

Allow building Miri with --features from miri-script rust-lang/miri#4396

Merged

matthiaskrgr mentioned this pull request Jun 13, 2025

Rollup of 10 pull requests #142442

Merged

bors merged commit 4838c00 into rust-lang:master Jun 13, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 13, 2025

Stypox mentioned this pull request Jul 10, 2025

Change bootstrap's tool.TOOL_NAME.features to work on any subcommand #143733

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add bootstrap option to compile a tool with features #142379

Add bootstrap option to compile a tool with features #142379

Uh oh!

Stypox commented Jun 11, 2025 •

edited

Loading

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented Jun 11, 2025

Uh oh!

jieyouxu commented Jun 11, 2025

Uh oh!

Kobzol left a comment •

edited

Loading

Uh oh!

Uh oh!

Stypox commented Jun 12, 2025

Uh oh!

Kobzol commented Jun 12, 2025

Uh oh!

bors commented Jun 12, 2025

Uh oh!

Uh oh!

Uh oh!

Add bootstrap option to compile a tool with features #142379

Add bootstrap option to compile a tool with features #142379

Uh oh!

Conversation

Stypox commented Jun 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented Jun 11, 2025

Uh oh!

jieyouxu commented Jun 11, 2025

Uh oh!

Kobzol left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Stypox commented Jun 12, 2025

Uh oh!

Kobzol commented Jun 12, 2025

Uh oh!

bors commented Jun 12, 2025

Uh oh!

Uh oh!

Uh oh!

Stypox commented Jun 11, 2025 •

edited

Loading

Kobzol left a comment •

edited

Loading