]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #103744 - palfrey:unwind-upgrade-cc, r=Mark-Simulacrum
authorManish Goregaokar <manishsmail@gmail.com>
Mon, 14 Nov 2022 02:49:24 +0000 (21:49 -0500)
committerGitHub <noreply@github.com>
Mon, 14 Nov 2022 02:49:24 +0000 (21:49 -0500)
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

1  2 
Cargo.lock
library/unwind/Cargo.toml

diff --cc Cargo.lock
Simple merge
index 32c4a7eb5c18cb0f0b2ff1c8debee4a2690265f8,f3e4d3db495d93ab42a56354c0a556e9a9b00d8c..eab2717c45233e2754c6a2254d588750935f6221
@@@ -17,10 -17,10 +17,10 @@@ doc = fals
  core = { path = "../core" }
  libc = { version = "0.2.79", features = ['rustc-dep-of-std'], default-features = false }
  compiler_builtins = "0.1.0"
 -cfg-if = "0.1.8"
 +cfg-if = "1.0"
  
  [build-dependencies]
- cc = "1.0.69"
+ cc = "1.0.76"
  
  [features]