diff options
| author | 许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com> | 2025-02-28 21:42:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-28 21:42:05 +0800 |
| commit | 46f5dea7c5836a9578c2bc2859df36ce2410d2f0 (patch) | |
| tree | 99a1e0da9c5b2e2cd609c90d1f5eb43a073b61ea /compiler | |
| parent | 30cb0282be17dabe207537c8e29b8abba3a5c6ab (diff) | |
| parent | e3f42aa59fd9e325690bb32f10e865c9a6f47779 (diff) | |
| download | rust-46f5dea7c5836a9578c2bc2859df36ce2410d2f0.tar.gz rust-46f5dea7c5836a9578c2bc2859df36ce2410d2f0.zip | |
Rollup merge of #137788 - jieyouxu:bump-compiler-cc, r=lqd,Kobzol
Bump `rustc_{codegen_ssa,llvm}` `cc` to 1.2.16 to fix `x86` Windows jobs on newest Windows SDK
Part of #137733.
Bump `rustc_{codegen_ssa,llvm}` `cc` to 1.2.16 which contains https://github.com/rust-lang/cc-rs/pull/1425 to help with #137733. Previously tested in https://github.com/rust-lang/rust/pull/137724.
#### `cc` changelog between 1.2.13 and 1.2.16
<details>
<summary>`cc` changes since 1.2.13 up to and including 1.2.16</summary>
##### [1.2.16](https://github.com/rust-lang/cc-rs/compare/cc-v1.2.15...cc-v1.2.16) - 2025-02-28
###### Fixed
- force windows compiler to run in `out_dir` to prevent artifacts in cwd (#1415)
###### Other
- use `/arch:SSE2` for `x86` target arch (#1425)
- Regenerate windows-sys binding ([#1422](https://github.com/rust-lang/cc-rs/pull/1422))
- Regenerate target info ([#1418](https://github.com/rust-lang/cc-rs/pull/1418))
- Add LIB var when compiling flag_check (#1417)
- Change flag ordering ([#1403](https://github.com/rust-lang/cc-rs/pull/1403))
- Fix archiver detection for musl cross compilation ([#1404](https://github.com/rust-lang/cc-rs/pull/1404))
##### [1.2.15](https://github.com/rust-lang/cc-rs/compare/cc-v1.2.14...cc-v1.2.15) - 2025-02-21
###### Other
- Regenerate target info ([#1406](https://github.com/rust-lang/cc-rs/pull/1406))
- Always read from all `CFLAGS`-style flags ([#1401](https://github.com/rust-lang/cc-rs/pull/1401))
- Simplify the error output on failed `Command` invocation ([#1397](https://github.com/rust-lang/cc-rs/pull/1397))
##### [1.2.14](https://github.com/rust-lang/cc-rs/compare/cc-v1.2.13...cc-v1.2.14) - 2025-02-14
###### Other
- Regenerate target info ([#1398](https://github.com/rust-lang/cc-rs/pull/1398))
- Add support for setting `-gdwarf-{version}` based on RUSTFLAGS ([#1395](https://github.com/rust-lang/cc-rs/pull/1395))
- Add support for alternative network stack io-sock on QNX 7.1 aarch64 and x86_64 ([#1312](https://github.com/rust-lang/cc-rs/pull/1312))
</details>
r? `@Kobzol`
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_codegen_ssa/Cargo.toml | 2 | ||||
| -rw-r--r-- | compiler/rustc_llvm/Cargo.toml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index 83d847f2d15..1346efcb87c 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -11,7 +11,7 @@ bitflags = "2.4.1" bstr = "1.11.3" # Pinned so `cargo update` bumps don't cause breakage. Please also update the # `cc` in `rustc_llvm` if you update the `cc` here. -cc = "=1.2.13" +cc = "=1.2.16" either = "1.5.0" itertools = "0.12" pathdiff = "0.2.0" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 4f3ce77efc4..061562b2ec5 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -12,5 +12,5 @@ libc = "0.2.73" # tidy-alphabetical-start # Pinned so `cargo update` bumps don't cause breakage. Please also update the # pinned `cc` in `rustc_codegen_ssa` if you update `cc` here. -cc = "=1.2.13" +cc = "=1.2.16" # tidy-alphabetical-end |