Skip to content

Commit

Permalink
Auto merge of rust-lang#136720 - clubby789:bootstrap-ccmake, r=<try>
Browse files Browse the repository at this point in the history
[EXPERIMENTAL] Bump `cc` (1.2.12) and `cmake` (0.1.53) for bootstrap

Let's try rust-lang#136440 once more

try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-various-2
  • Loading branch information
bors committed Feb 8, 2025
2 parents a9e7b30 + 7d14918 commit aa3d7d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/bootstrap/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ dependencies = [

[[package]]
name = "cc"
version = "1.2.0"
version = "1.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
dependencies = [
"shlex",
]
Expand Down Expand Up @@ -149,9 +149,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"

[[package]]
name = "cmake"
version = "0.1.48"
version = "0.1.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
checksum = "e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6"
dependencies = [
"cc",
]
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ test = false
# Most of the time updating these dependencies requires modifications to the
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
cc = "=1.2.0"
cmake = "=0.1.48"
cc = "=1.2.12"
cmake = "=0.1.53"

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

0 comments on commit aa3d7d4

Please sign in to comment.