Update cc-rs to 1.2.33 #146186

dpaoliello · 2025-09-04T00:06:25Z

For my purposes, contains fixes when compiling the Rust compiler for Arm64EC.

Checked the commits since 1.2.16, and I don't see anything else that may affect Rust?

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

rustbot · 2025-09-04T00:06:28Z

Failed to set assignee to NobodyXu: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

rustbot · 2025-09-04T00:06:31Z

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.

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

jieyouxu · 2025-09-04T01:03:49Z

@bors try jobs=aarch64-msvc-1,aarch64-apple,test-various,dist-apple-various

Update cc-rs to 1.2.33 try-job: aarch64-msvc-1 try-job: aarch64-apple try-job: test-various try-job: dist-apple-various

rust-bors · 2025-09-04T03:17:03Z

☀️ Try build successful (CI)
Build commit: d8ac12e (d8ac12e3b0cef5271092800d62ab852417973355, parent: a1208bf765ba783ee4ebdc4c29ab0a0c215806ef)

compiler/rustc_codegen_ssa/Cargo.toml

jieyouxu · 2025-09-04T14:24:37Z

Let me know @dpaoliello if you want to try with find-msvc-tools, otherwise I'm fine with the current change as well.
@rustbot author

rustbot · 2025-09-04T14:24:42Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

dpaoliello · 2025-09-04T19:00:31Z

I switched to find-msvc-tools, since I was here changing things.

@rustbot ready

rustbot · 2025-09-04T19:06:53Z

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

davidtwco · 2025-09-04T21:43:38Z

@bors r=davidtwco,jieyouxu

bors · 2025-09-04T21:43:41Z

📌 Commit 45a0e10 has been approved by davidtwco,jieyouxu

It is now in the queue for this repository.

dpaoliello · 2025-09-08T17:35:05Z

@bors2 try jobs=dist-aarch64-linux

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

rust-bors · 2025-09-08T17:59:33Z

💔 Test for 083d034 failed: CI. Failed jobs:

try - dist-aarch64-linux (web logs, extended logs)

bors · 2025-09-09T08:28:29Z

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

lambdageek · 2025-09-09T14:11:11Z

@dpaoliello nice cleanup. Please consider cherrypicking lambdageek@797c4b1 which should switch rust_windows_rc to use find-msvc-tools, too

lambdageek · 2025-09-09T14:13:39Z

compiler/rustc_codegen_ssa/src/back/linker.rs

    if sess.target.is_like_msvc
        && let Some(ref tool) = msvc_tool
    {
-        cmd.args(tool.args());


Why is this ok? It looked to me like cc::windows_registry::find_tool can have extra arguments here, while find_msvc_tools::find_tool cannot

The old windows_registry::find_tool never set any args, which is why find_msvc_tools dropped it
https://github.com/rust-lang/cc-rs/blob/3c1325b09a78827fb2beb3ea9e8f1e3f84876b64/src/windows/find_tools.rs#L359-L371

dpaoliello · 2025-09-09T16:07:53Z

Please consider cherrypicking lambdageek@797c4b1 which should switch rust_windows_rc to use find-msvc-tools, too

I have concerns with that change: I don't think we can rely on HOST being set.

I will switch rust_windows_rc to use find-msvc-tools, that seems reasonable, but I suggest that we make find-msvc-tools natively know how to find tools that ship in the Windows SDK.

lambdageek · 2025-09-09T16:45:01Z

I don't think we can rely on HOST being set

From https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts

HOST — the host triple of the Rust compiler.

Is the concern that it might be set to something unexpected when bootstrapping the compiler?

dpaoliello · 2025-09-09T18:17:46Z

... but I suggest that we make find-msvc-tools natively know how to find tools that ship in the Windows SDK.

Decided to implement this myself: rust-lang/cc-rs#1553

dpaoliello · 2025-09-16T16:21:35Z

asked in #t-compiler/help > compiler cc bump failure

Opened another thread in #t-infra

dpaoliello · 2025-09-23T22:13:08Z

@bors2 try jobs=dist-aarch64-linux

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

dpaoliello · 2025-09-23T22:20:54Z

@bors try cancel

rust-bors · 2025-09-23T22:20:57Z

Try build cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/17960406410

dpaoliello · 2025-09-23T22:21:37Z

@bors2 try jobs=dist-aarch64-linux

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

dpaoliello · 2025-09-24T00:02:41Z

Current test build using a patched version of jemalloc to strip the -flto arg is part the point-of-failure, so submitted an upstream PR: tikv/jemallocator#144

rust-bors · 2025-09-24T00:38:47Z

☀️ Try build successful (CI)
Build commit: 70c9139 (70c9139e1af293ca2c92ec727e21cbdba4170b73, parent: 975e6c8fec280816d24fbde6b8dfe19620f2efe6)

jieyouxu self-assigned this Sep 4, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Sep 4, 2025

Auto merge of #146186 - dpaoliello:cc, r=<try>

d8ac12e

Update cc-rs to 1.2.33 try-job: aarch64-msvc-1 try-job: aarch64-apple try-job: test-various try-job: dist-apple-various

NobodyXu reviewed Sep 4, 2025

View reviewed changes

compiler/rustc_codegen_ssa/Cargo.toml Outdated Show resolved Hide resolved

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2025

dpaoliello force-pushed the cc branch from 985cb6d to b8733d8 Compare September 4, 2025 18:56

This comment has been minimized.

Sign in to view

dpaoliello changed the title ~~Update cc-rs to 1.2.33~~ Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools Sep 4, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 4, 2025

This comment has been minimized.

Sign in to view

dpaoliello force-pushed the cc branch from b8733d8 to 45a0e10 Compare September 4, 2025 19:06

rustbot added A-tidy Area: The tidy tool T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Sep 4, 2025

davidtwco approved these changes Sep 4, 2025

View reviewed changes

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2025

dpaoliello force-pushed the cc branch from aa4469e to ce89ffe Compare September 8, 2025 17:34

rust-bors bot added a commit that referenced this pull request Sep 8, 2025

Auto merge of #146186 - dpaoliello:cc, r=<try>

083d034

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

This comment has been minimized.

Sign in to view

lambdageek reviewed Sep 9, 2025

View reviewed changes

dpaoliello force-pushed the cc branch from ce89ffe to 18413db Compare September 9, 2025 20:13

Update cc-rs to 1.2.33

c4b98c4

dpaoliello force-pushed the cc branch from 18413db to c4b98c4 Compare September 23, 2025 21:56

This comment has been minimized.

Sign in to view

Test jemalloc fix

ea1101f

rust-bors bot added a commit that referenced this pull request Sep 23, 2025

Auto merge of #146186 - dpaoliello:cc, r=<try>

98270f8

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Sep 23, 2025

Auto merge of #146186 - dpaoliello:cc, r=<try>

70c9139

Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux

This comment has been minimized.

Sign in to view

dpaoliello mentioned this pull request Sep 23, 2025

Filter out -flto args from cc, don't set env vars that result in duplicated args tikv/jemallocator#144

Open

dpaoliello changed the title ~~Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools~~ Update cc-rs to 1.2.33 Sep 25, 2025

Update cc-rs to 1.2.33 #146186

Are you sure you want to change the base?

Update cc-rs to 1.2.33 #146186

Conversation

dpaoliello commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 4, 2025

Uh oh!

rustbot commented Sep 4, 2025

Uh oh!

jieyouxu commented Sep 4, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Sep 4, 2025

Uh oh!

Uh oh!

jieyouxu commented Sep 4, 2025

Uh oh!

rustbot commented Sep 4, 2025

Uh oh!

This comment has been minimized.

dpaoliello commented Sep 4, 2025

Uh oh!

This comment has been minimized.

rustbot commented Sep 4, 2025

Uh oh!

davidtwco commented Sep 4, 2025

Uh oh!

bors commented Sep 4, 2025

Uh oh!

dpaoliello commented Sep 8, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Sep 8, 2025

Uh oh!

bors commented Sep 9, 2025

Uh oh!

lambdageek commented Sep 9, 2025

Uh oh!

lambdageek Sep 9, 2025 • 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!

dpaoliello Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

dpaoliello commented Sep 9, 2025

Uh oh!

lambdageek commented Sep 9, 2025

Uh oh!

dpaoliello commented Sep 9, 2025

Uh oh!

dpaoliello commented Sep 16, 2025

Uh oh!

This comment has been minimized.

dpaoliello commented Sep 23, 2025

Uh oh!

This comment has been minimized.

dpaoliello commented Sep 23, 2025

Uh oh!

rust-bors bot commented Sep 23, 2025

Uh oh!

dpaoliello commented Sep 23, 2025

Uh oh!

This comment has been minimized.

dpaoliello commented Sep 24, 2025

Uh oh!

rust-bors bot commented Sep 24, 2025

Uh oh!

Uh oh!

dpaoliello commented Sep 4, 2025 •

edited

Loading

lambdageek Sep 9, 2025 •

edited

Loading