diff options
| author | bors <bors@rust-lang.org> | 2025-01-03 00:49:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-03 00:49:40 +0000 |
| commit | 953a5caef005993f93d8fe9baa344cc2591496c2 (patch) | |
| tree | d37e31ad625b41a460d0ad445f6d25521d09872c /compiler/rustc_llvm | |
| parent | 0857a8e32cd55fca2e6c648e586f9ce46c22eb42 (diff) | |
| parent | f72c836093960d1f2027e4316ad099da049ceaa0 (diff) | |
| download | rust-953a5caef005993f93d8fe9baa344cc2591496c2.tar.gz rust-953a5caef005993f93d8fe9baa344cc2591496c2.zip | |
Auto merge of #135048 - cuviper:beta-next, r=cuviper
[beta] backports - Do not call `extern_crate` on current trait on crate mismatch errors #133585 - Correctly handle comments in attributes in doctests source code #134260 - Correctly document CTFE behavior of is_null and methods that call is_null. #134325 - Make sure we handle `backwards_incompatible_lint` drops appropriately in drop elaboration #134486 - Bump compiler `cc` to 1.2.5 #134505 - Handle `DropKind::ForLint` in coroutines correctly #134575 - docs: inline `std::ffi::c_str` types to `std::ffi` #134791 - docs: inline `alloc::ffi::c_str` types to `alloc::ffi` #134851 r? cuviper
Diffstat (limited to 'compiler/rustc_llvm')
| -rw-r--r-- | compiler/rustc_llvm/Cargo.toml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index b29d6b79250..79a6454dbb9 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -10,5 +10,7 @@ libc = "0.2.73" [build-dependencies] # tidy-alphabetical-start -cc = "1.1.23" +# 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.5" # tidy-alphabetical-end |