Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dbfe100

Browse files
committedMar 21, 2025
Auto merge of #138784 - madsmtm:bootstrap-bump-cc-cmake, r=<try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54 The `cc` version in `bootstrap` was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again. See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here. r? jieyouxu who tried this last in #137022. `@rustbot` label T-bootstrap try-job: dist-apple-various
2 parents 4ac032f + 673b519 commit dbfe100

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed
 

‎src/bootstrap/Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ dependencies = [
8888

8989
[[package]]
9090
name = "cc"
91-
version = "1.1.22"
91+
version = "1.2.17"
9292
source = "registry+https://github.com/rust-lang/crates.io-index"
93-
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
93+
checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
9494
dependencies = [
9595
"shlex",
9696
]
@@ -150,9 +150,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
150150

151151
[[package]]
152152
name = "cmake"
153-
version = "0.1.48"
153+
version = "0.1.54"
154154
source = "registry+https://github.com/rust-lang/crates.io-index"
155-
checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
155+
checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
156156
dependencies = [
157157
"cc",
158158
]

‎src/bootstrap/Cargo.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ test = false
3232
# Most of the time updating these dependencies requires modifications to the
3333
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
3434
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
35-
#
36-
# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed.
37-
cc = "=1.1.22"
38-
cmake = "=0.1.48"
35+
cc = "=1.2.17"
36+
cmake = "=0.1.54"
3937

4038
build_helper = { path = "../build_helper" }
4139
clap = { version = "4.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }

0 commit comments

Comments
 (0)
Please sign in to comment.