Allow windows resource compiler to be overridden by erickt · Pull Request #146663 · rust-lang/rust

erickt · 2025-09-17T01:03:37Z

In #146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK.

cc @lambdageek

rustbot · 2025-09-17T01:03:39Z

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.

rustbot · 2025-09-17T01:03:41Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

erickt · 2025-09-17T02:44:01Z

I think the latest version has addressed all the rustbot comments.

wesleywiser

I'll let @lambdageek review too before r+'ing but this lgtm!

View changes since this review

lambdageek · 2025-09-17T20:17:53Z

@wesleywiser LGTM

wesleywiser · 2025-09-17T20:28:52Z

@bors r+

bors · 2025-09-17T20:28:55Z

📌 Commit 11cc0bc has been approved by wesleywiser

It is now in the queue for this repository.

wesleywiser · 2025-09-17T20:32:20Z

@bors rollup

Allow windows resource compiler to be overridden In rust-lang#146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK. cc `@lambdageek`

fmease · 2025-09-18T00:59:56Z

Conflict @bors r-

bors · 2025-09-18T01:57:52Z

☔ The latest upstream changes (presumably #146685) made this pull request unmergeable. Please resolve the merge conflicts.

It is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK.

rustbot · 2025-09-18T16:51:41Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

erickt · 2025-09-18T16:52:50Z

@fmease - Rebased my patch to resolve the merge conflict.

fmease · 2025-09-18T17:51:42Z

@bors r=wesleywiser

bors · 2025-09-18T17:51:45Z

📌 Commit 7f55f57 has been approved by wesleywiser

It is now in the queue for this repository.

Allow windows resource compiler to be overridden In rust-lang#146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK. cc `@lambdageek`

Rollup of 8 pull requests Successful merges: - #146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set) - #146615 (rustc_codegen_llvm: Feature Conversion Tidying) - #146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`) - #146663 (Allow windows resource compiler to be overridden) - #146691 (std: Fix WASI implementation of `remove_dir_all`) - #146709 (stdarch subtree update) - #146731 (test: Use SVG for terminal url test) - #146738 (Fix tidy spellchecking on Windows) r? `@ghost` `@rustbot` modify labels: rollup

Allow windows resource compiler to be overridden In rust-lang#146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK. cc ``@lambdageek``

Rollup of 10 pull requests Successful merges: - #146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set) - #146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output) - #146541 (std: simplify host lookup) - #146615 (rustc_codegen_llvm: Feature Conversion Tidying) - #146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`) - #146663 (Allow windows resource compiler to be overridden) - #146691 (std: Fix WASI implementation of `remove_dir_all`) - #146709 (stdarch subtree update) - #146738 (Fix tidy spellchecking on Windows) - #146740 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146663 - erickt:win, r=wesleywiser Allow windows resource compiler to be overridden In #146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK. cc ```@lambdageek```

Rollup of 10 pull requests Successful merges: - rust-lang/rust#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set) - rust-lang/rust#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output) - rust-lang/rust#146541 (std: simplify host lookup) - rust-lang/rust#146615 (rustc_codegen_llvm: Feature Conversion Tidying) - rust-lang/rust#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`) - rust-lang/rust#146663 (Allow windows resource compiler to be overridden) - rust-lang/rust#146691 (std: Fix WASI implementation of `remove_dir_all`) - rust-lang/rust#146709 (stdarch subtree update) - rust-lang/rust#146738 (Fix tidy spellchecking on Windows) - rust-lang/rust#146740 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Allow windows resource compiler to be overridden In rust-lang#146018, it is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK. cc ```@lambdageek```

Rollup of 10 pull requests Successful merges: - rust-lang#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set) - rust-lang#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output) - rust-lang#146541 (std: simplify host lookup) - rust-lang#146615 (rustc_codegen_llvm: Feature Conversion Tidying) - rust-lang#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`) - rust-lang#146663 (Allow windows resource compiler to be overridden) - rust-lang#146691 (std: Fix WASI implementation of `remove_dir_all`) - rust-lang#146709 (stdarch subtree update) - rust-lang#146738 (Fix tidy spellchecking on Windows) - rust-lang#146740 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 10 pull requests Successful merges: - rust-lang/rust#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set) - rust-lang/rust#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output) - rust-lang/rust#146541 (std: simplify host lookup) - rust-lang/rust#146615 (rustc_codegen_llvm: Feature Conversion Tidying) - rust-lang/rust#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`) - rust-lang/rust#146663 (Allow windows resource compiler to be overridden) - rust-lang/rust#146691 (std: Fix WASI implementation of `remove_dir_all`) - rust-lang/rust#146709 (stdarch subtree update) - rust-lang/rust#146738 (Fix tidy spellchecking on Windows) - rust-lang/rust#146740 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

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 Sep 17, 2025

rustbot assigned Mark-Simulacrum Sep 17, 2025

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 17, 2025

This comment has been minimized.

Sign in to view

erickt force-pushed the win branch from 9ee42ee to 99d6535 Compare September 17, 2025 02:42

This comment has been minimized.

Sign in to view

erickt force-pushed the win branch from 99d6535 to 11cc0bc Compare September 17, 2025 02:43

wesleywiser approved these changes Sep 17, 2025

View reviewed changes

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 Sep 17, 2025

fmease mentioned this pull request Sep 18, 2025

Rollup of 4 pull requests #146695

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2025

jieyouxu mentioned this pull request Sep 18, 2025

[beta] Revert "compiler: Add Windows resources to rustc-main and rustc_driver" #146687

Merged

Allow windows resource compiler to be overridden

7f55f57

It is now required to provide a resource compiler on windows when compiling rust. This allows toolchain builders to explicitly provide a path to an alternative, such as llvm-rc, instead of the one that's provided by the Windows SDK.

erickt force-pushed the win branch from 11cc0bc to 7f55f57 Compare September 18, 2025 16:51

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2025

lambdageek mentioned this pull request Sep 18, 2025

Rustc failed to locate rc.exe on VS2022 Command Prompt, causing panic #146693

Closed

jhpratt mentioned this pull request Sep 19, 2025

Rollup of 8 pull requests #146746

Closed

This was referenced Sep 19, 2025

Rollup of 10 pull requests #146760

Closed

Rollup of 10 pull requests #146765

Merged

bors merged commit 743f70b into rust-lang:master Sep 19, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Sep 19, 2025

lambdageek mentioned this pull request Sep 19, 2025

[win] Use find-msvc-tools instead of cc to find the linker and rc on Windows #146784

Merged

erickt deleted the win branch September 19, 2025 19:22

Urgau mentioned this pull request Oct 1, 2025

Can't bootstrap 1.89 on Windows with custom dlltool #147229

Open

Uh oh!

Conversation

erickt commented Sep 17, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 17, 2025

Uh oh!

rustbot commented Sep 17, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

erickt commented Sep 17, 2025

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lambdageek commented Sep 17, 2025

Uh oh!

wesleywiser commented Sep 17, 2025

Uh oh!

bors commented Sep 17, 2025

Uh oh!

wesleywiser commented Sep 17, 2025

Uh oh!

fmease commented Sep 18, 2025

Uh oh!

bors commented Sep 18, 2025

Uh oh!

rustbot commented Sep 18, 2025

Uh oh!

erickt commented Sep 18, 2025

Uh oh!

fmease commented Sep 18, 2025

Uh oh!

bors commented Sep 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

erickt commented Sep 17, 2025 •

edited by rustbot

Loading

wesleywiser left a comment •

edited by rustbot

Loading