Skip to content

Commit 4c40c89

Browse files
committed
Auto merge of rust-lang#134505 - jieyouxu:boop-compiler-cc, r=clubby789,jieyouxu
Bump compiler `cc` to 1.2.5 - `cc` 1.2.4 contains a fix to address [rustc uses wrong build tools when compiling from MSVC rust-lang#133794](rust-lang#133794). See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.4>. - `cc` 1.2.5 contains a fix to also check linking when testing if certain compiler flags are supported, which fixed an issue that was causing previous compiler `cc` bumps to fail. See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.5>. Supersedes rust-lang#134419. Fixes rust-lang#133794. r? `@clubby789`
2 parents 387b245 + 3775d22 commit 4c40c89

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Diff for: Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ version = "0.1.0"
405405

406406
[[package]]
407407
name = "cc"
408-
version = "1.2.0"
408+
version = "1.2.5"
409409
source = "registry+https://github.com/rust-lang/crates.io-index"
410-
checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
410+
checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
411411
dependencies = [
412412
"shlex",
413413
]

Diff for: compiler/rustc_codegen_ssa/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ edition = "2021"
88
ar_archive_writer = "0.4.2"
99
arrayvec = { version = "0.7", default-features = false }
1010
bitflags = "2.4.1"
11-
# Pinned so `cargo update` bumps don't cause breakage
12-
cc = "=1.2.0"
11+
# Pinned so `cargo update` bumps don't cause breakage. Please also update the
12+
# `cc` in `rustc_llvm` if you update the `cc` here.
13+
cc = "=1.2.5"
1314
either = "1.5.0"
1415
itertools = "0.12"
1516
pathdiff = "0.2.0"

Diff for: compiler/rustc_llvm/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ libc = "0.2.73"
1010

1111
[build-dependencies]
1212
# tidy-alphabetical-start
13-
cc = "1.1.23"
13+
# Pinned so `cargo update` bumps don't cause breakage. Please also update the
14+
# pinned `cc` in `rustc_codegen_ssa` if you update `cc` here.
15+
cc = "=1.2.5"
1416
# tidy-alphabetical-end

0 commit comments

Comments
 (0)