Skip to content

Commit 1a0bdd7

Browse files
committed
Auto merge of rust-lang#134344 - moturus:master, r=jieyouxu
Repoint cc dep in bootstrap to its latest version. v1.2.4 handles new/unofficial targets much better than v1.2.0. More specifically, v1.2.4 allows using env vars to pass target parameters to cc crate, as discussed in rust-lang/cc-rs#1317. With v1.2.0, unofficial targets like [Motor OS](https://github.com/moturus/motor-os) [cannot](moturus/motor-os#18) easily rebase to the current rust-lang and have to stay at an [older version](https://github.com/moturus/rust/tree/motor-os_2024-10-18). Also bump cmake's version from 0.1.48 to 0.1.52, as it is linked to cc. cc-rs changelogs: [1.2.4](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md#121---2024-11-14) [1.2.3](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md#123---2024-12-06) [1.2.2](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md#122---2024-11-29) [1.2.1](https://github.com/rust-lang/cc-rs/blob/main/CHANGELOG.md#121---2024-11-14) cmake changelogs/releases: [0.1.52](https://github.com/rust-lang/cmake-rs/blob/master/CHANGELOG.md#0152---2024-11-25) [0.1.51](https://github.com/rust-lang/cmake-rs/blob/master/CHANGELOG.md#0151---2024-08-15) 0.1.50: not a release [0.1.49](https://github.com/rust-lang/cmake-rs/releases/tag/0.1.49)
2 parents f2b91cc + f396e87 commit 1a0bdd7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/bootstrap/Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ dependencies = [
8484

8585
[[package]]
8686
name = "cc"
87-
version = "1.2.0"
87+
version = "1.2.4"
8888
source = "registry+https://github.com/rust-lang/crates.io-index"
89-
checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
89+
checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
9090
dependencies = [
9191
"shlex",
9292
]
@@ -146,9 +146,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
146146

147147
[[package]]
148148
name = "cmake"
149-
version = "0.1.48"
149+
version = "0.1.52"
150150
source = "registry+https://github.com/rust-lang/crates.io-index"
151-
checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
151+
checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
152152
dependencies = [
153153
"cc",
154154
]

src/bootstrap/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ test = false
3737
# Most of the time updating these dependencies requires modifications to the
3838
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
3939
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
40-
cc = "=1.2.0"
41-
cmake = "=0.1.48"
40+
cc = "=1.2.4"
41+
cmake = "=0.1.52"
4242

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

0 commit comments

Comments
 (0)