Skip to content

Commit ab4960e

Browse files
committed
Auto merge of #148298 - jieyouxu:revert-cc, r=madsmtm
Revert "Auto merge of #146186 - dpaoliello:cc, r=jieyouxu" This reverts #146186. This will mean regressing whichever `cc` fixes were needed for > fixes when compiling the Rust compiler for Arm64EC. It's not clear which `cc` change causes the across-the-board perf regression, I suspect it's a change in how certain compiler flags are handed. But I can immediately tell this is a rabbit hole to investigate, so let's revert for now to return-to-baseline and alleviate time pressure.
2 parents d5419f1 + 2b9b7bb commit ab4960e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Cargo.lock

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,10 @@ version = "0.1.0"
474474

475475
[[package]]
476476
name = "cc"
477-
version = "1.2.39"
477+
version = "1.2.16"
478478
source = "registry+https://github.com/rust-lang/crates.io-index"
479-
checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
479+
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
480480
dependencies = [
481-
"find-msvc-tools",
482481
"jobserver",
483482
"libc",
484483
"shlex",

compiler/rustc_llvm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ libc = "0.2.73"
1111
[build-dependencies]
1212
# tidy-alphabetical-start
1313
# `cc` updates often break things, so we pin it here.
14-
cc = "=1.2.39"
14+
cc = "=1.2.16"
1515
# tidy-alphabetical-end
1616

1717
[features]

0 commit comments

Comments
 (0)