about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2022-11-13 21:49:24 -0500
committerGitHub <noreply@github.com>2022-11-13 21:49:24 -0500
commitc9fc5cbeb5b682eb207cb190670027c497ea47a1 (patch)
tree5627832899d6e2621f86f82cf992d879b63d1e09
parent1b91bdfda995fa21b3019a85e12a063f32cd62af (diff)
parent18129b67a09f5a7df027d07316cee5a4eaeaf0dd (diff)
Rollup merge of #103744 - palfrey:unwind-upgrade-cc, r=Mark-Simulacrum
Upgrade cc for working is_flag_supported on cross-compiles

https://github.com/rust-lang/rust/pull/85806 fixed unwind v.s gcc support on later Android ndks using `is_flag_supported`. However, due to https://github.com/rust-lang/cc-rs/issues/675, this didn't work properly on cross-compiles. https://github.com/rust-lang/cc-rs/commit/3eeb50b391a7543a6fed96276ee9388b5430a50d fixes this, and was released in cc 1.0.74, hence the upgrade
-rw-r--r--Cargo.lock4
-rw-r--r--library/unwind/Cargo.toml2
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c105d04c1f4..23481488563 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -473,9 +473,9 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
 dependencies = [
  "jobserver",
 ]
diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml
index 32c4a7eb5c1..eab2717c452 100644
--- a/library/unwind/Cargo.toml
+++ b/library/unwind/Cargo.toml
@@ -20,7 +20,7 @@ compiler_builtins = "0.1.0"
 cfg-if = "1.0"
 
 [build-dependencies]
-cc = "1.0.69"
+cc = "1.0.76"
 
 [features]