Skip to content

Commit

Permalink
Auto merge of rust-lang#130898 - arttet:test/cc, r=<try>
Browse files Browse the repository at this point in the history
Bump cc dependency

We cannot merge the [PR](rust-lang#130720)
Let's try merging an older version for a change.

rust-lang#130720 (comment)

try-job: x86_64-msvc
  • Loading branch information
bors committed Sep 26, 2024
2 parents 4428a05 + 4c98033 commit ea47bea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions library/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"

[[package]]
name = "cc"
version = "1.0.99"
version = "1.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2"

[[package]]
name = "cfg-if"
Expand Down
4 changes: 3 additions & 1 deletion library/profiler_builtins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ core = { path = "../core" }
compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }

[build-dependencies]
cc = "1.0.97"
# FIXME: updates past a certain point haven't been able to merge successfully.
# See rust-lang/rust#130720.
cc = "=1.0.106"

0 comments on commit ea47bea

Please sign in to comment.