bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #134505 - jieyouxu:boop-compiler-cc, r=clubby789,jieyouxu

Browse source 
Bump compiler `cc` to 1.2.5

- `cc` 1.2.4 contains a fix to address [rustc uses wrong build tools when compiling from MSVC #133794](https://github.com/rust-lang/rust/issues/133794). See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.4>.
- `cc` 1.2.5 contains a fix to also check linking when testing if certain compiler flags are supported, which fixed an issue that was causing previous compiler `cc` bumps to fail. See <https://github.com/rust-lang/cc-rs/releases/tag/cc-v1.2.5>.

Supersedes #134419.
Fixes #133794.

r? `@clubby789`
This commit is contained in:
bors 2024-12-21 17:58:54 +00:00
commit 4c40c89c26
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_codegen_ssa/Cargo.toml
View file

@ -8,8 +8,9 @@ edition = "2021"
ar_archive_writer = "0.4.2"
arrayvec = { version = "0.7", default-features = false }
bitflags = "2.4.1"
# Pinned so `cargo update` bumps don't cause breakage
cc = "=1.2.0"
# 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.5"
either = "1.5.0"
itertools = "0.12"
pathdiff = "0.2.0"