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

dpaoliello · 2025-09-19T17:00:38Z

find-msvc-tools was factored out from cc to allow updating the use in rustc_codegen_ssa (finding the linker when running the Rust compiler) and rustc_windows_rc (finding the Windows Resource Compiler when running the Rust compiler) to be separate from the use in rustc_llvm (building LLVM as part of building the Rust compiler).

rustbot · 2025-09-19T17:00:41Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

rustbot · 2025-09-19T17:00:43Z

r? @nnethercote

rustbot has assigned @nnethercote.
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

compiler/rustc_windows_rc/src/lib.rs

…Windows

rustbot · 2025-09-19T19:00:34Z

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.

jieyouxu · 2025-09-20T04:40:53Z

r? @wesleywiser (since you have more context)

rustbot · 2025-09-20T04:40:57Z

wesleywiser is currently at their maximum review capacity.
They may take a while to respond.

nnethercote

Seems like a nice simplification, but I'll let Wesley have the final say because he knows much more about Windows stuff than I do.

View changes since this review

lambdageek · 2025-09-20T14:53:32Z

compiler/rustc_windows_rc/Cargo.toml

-# `cc` updates often break things, so we pin it here. Cargo enforces "max 1 semver-compat version
-# per crate", so if you change this, you need to also change it in `rustc_llvm` and `rustc_codegen_ssa`.
-cc = "=1.2.16"
+find-msvc-tools = "0.1.2"


I see that some other crates use workspace dependencies, but I'm not sure if there are reasons why the compiler shouldn't use them. Would it make sense to set a single version in the workspace and update these two crates to use it?

I tried introducing workspace dependencies to the rust repo recently, and then soon after removed them in because they were causing problems. See #146113.

wesleywiser · 2025-09-22T17:58:27Z

@bors r+ rollup

bors · 2025-09-22T17:58:30Z

📌 Commit 4da5935 has been approved by wesleywiser

It is now in the queue for this repository.

[win] Use find-msvc-tools instead of cc to find the linker and rc on Windows `find-msvc-tools` was factored out from `cc` to allow updating the use in `rustc_codegen_ssa` (finding the linker when running the Rust compiler) and `rustc_windows_rc` (finding the Windows Resource Compiler when running the Rust compiler) to be separate from the use in `rustc_llvm` (building LLVM as part of building the Rust compiler).

Rollup of 13 pull requests Successful merges: - #146632 (Fix uses of "adaptor") - #146731 (test: Use SVG for terminal url test) - #146775 (fixes for numerous clippy warnings) - #146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows) - #146799 (Fix a dangling reference in `rustc_thread_pool`) - #146802 (mbe: Simplifications and refactoring) - #146806 (add private module override re-export test) - #146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly)) - #146875 (tests/run-make/crate-loading: Rename source files for clarity) - #146896 (rustc-dev-guide subtree update) - #146898 (Update books) - #146899 (Fix a crash/mislex when more than one frontmatter closing possibility is considered) - #146907 (add regression test for issue 146537) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 10 pull requests Successful merges: - #146632 (Fix uses of "adaptor") - #146731 (test: Use SVG for terminal url test) - #146775 (fixes for numerous clippy warnings) - #146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows) - #146799 (Fix a dangling reference in `rustc_thread_pool`) - #146802 (mbe: Simplifications and refactoring) - #146806 (add private module override re-export test) - #146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly)) - #146875 (tests/run-make/crate-loading: Rename source files for clarity) - #146877 (prevent line number from being copied in chrome) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146784 - dpaoliello:findmsvc, r=wesleywiser [win] Use find-msvc-tools instead of cc to find the linker and rc on Windows `find-msvc-tools` was factored out from `cc` to allow updating the use in `rustc_codegen_ssa` (finding the linker when running the Rust compiler) and `rustc_windows_rc` (finding the Windows Resource Compiler when running the Rust compiler) to be separate from the use in `rustc_llvm` (building LLVM as part of building the Rust compiler).

[win] Use find-msvc-tools instead of cc to find the linker and rc on Windows `find-msvc-tools` was factored out from `cc` to allow updating the use in `rustc_codegen_ssa` (finding the linker when running the Rust compiler) and `rustc_windows_rc` (finding the Windows Resource Compiler when running the Rust compiler) to be separate from the use in `rustc_llvm` (building LLVM as part of building the Rust compiler).

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#146632 (Fix uses of "adaptor") - rust-lang#146731 (test: Use SVG for terminal url test) - rust-lang#146775 (fixes for numerous clippy warnings) - rust-lang#146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows) - rust-lang#146799 (Fix a dangling reference in `rustc_thread_pool`) - rust-lang#146802 (mbe: Simplifications and refactoring) - rust-lang#146806 (add private module override re-export test) - rust-lang#146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly)) - rust-lang#146875 (tests/run-make/crate-loading: Rename source files for clarity) - rust-lang#146877 (prevent line number from being copied in chrome) r? `@ghost` `@rustbot` modify labels: rollup

rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 19, 2025

rustbot assigned nnethercote Sep 19, 2025

rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 19, 2025

lambdageek reviewed Sep 19, 2025

View reviewed changes

compiler/rustc_windows_rc/src/lib.rs Outdated Show resolved Hide resolved

dpaoliello force-pushed the findmsvc branch from f5b3d5e to c3e7cb5 Compare September 19, 2025 18:47

This was referenced Sep 19, 2025

Try to find the Windows resource compiler on the PATH first #146689

Closed

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

Closed

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

4da5935

…Windows

dpaoliello force-pushed the findmsvc branch from c3e7cb5 to 4da5935 Compare September 19, 2025 19:00

lambdageek approved these changes Sep 19, 2025

View reviewed changes

rustbot assigned wesleywiser and unassigned nnethercote Sep 20, 2025

nnethercote reviewed Sep 20, 2025

View reviewed changes

lambdageek reviewed Sep 20, 2025

View reviewed changes

wesleywiser approved these changes Sep 22, 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 22, 2025

Zalathar mentioned this pull request Sep 23, 2025

Rollup of 13 pull requests #146916

Closed

matthiaskrgr mentioned this pull request Sep 23, 2025

Rollup of 10 pull requests #146938

Merged

bors merged commit 8f11c4d into rust-lang:master Sep 23, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Sep 23, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

dpaoliello commented Sep 19, 2025

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

jieyouxu commented Sep 20, 2025

Uh oh!

rustbot commented Sep 20, 2025

Uh oh!

nnethercote left a comment •

edited by rustbot

Loading

Uh oh!

lambdageek Sep 20, 2025

Uh oh!

nnethercote Sep 20, 2025

Uh oh!

wesleywiser commented Sep 22, 2025

Uh oh!

bors commented Sep 22, 2025

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

dpaoliello commented Sep 19, 2025

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

Uh oh!

rustbot commented Sep 19, 2025

Uh oh!

jieyouxu commented Sep 20, 2025

Uh oh!

rustbot commented Sep 20, 2025

Uh oh!

nnethercote 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 Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

wesleywiser commented Sep 22, 2025

Uh oh!

bors commented Sep 22, 2025

Uh oh!

Uh oh!

Uh oh!

nnethercote left a comment •

edited by rustbot

Loading