Commit e2494ec
committed
Auto merge of #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 files changed
+6
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
149 | | - | |
| 149 | + | |
150 | 150 | | |
151 | | - | |
| 151 | + | |
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
| 40 | + | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
0 commit comments