Auto merge of #134505 - jieyouxu:boop-compiler-cc, r=clubby789,jieyouxu · rust-lang/rust@4c40c89 (original) (raw)

3 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -405,9 +405,9 @@ version = "0.1.0"
405 405
406 406 [[package]]
407 407 name = "cc"
408 -version = "1.2.0"
408 +version = "1.2.5"
409 409 source = "registry+https://github.com/rust-lang/crates.io-index"
410 -checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
410 +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
411 411 dependencies = [
412 412 "shlex",
413 413 ]
Original file line number Diff line number Diff line change
@@ -8,8 +8,9 @@ edition = "2021"
8 8 ar_archive_writer = "0.4.2"
9 9 arrayvec = { version = "0.7", default-features = false }
10 10 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"
13 14 either = "1.5.0"
14 15 itertools = "0.12"
15 16 pathdiff = "0.2.0"
Original file line number Diff line number Diff line change
@@ -10,5 +10,7 @@ libc = "0.2.73"
10 10
11 11 [build-dependencies]
12 12 # 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"
14 16 # tidy-alphabetical-end