bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #85806 - ATiltedTree:android-ndk-beta, r=petrochenkov

Browse source 
Support Android ndk versions `r23-beta3` and up

Since android ndk version `r23-beta3`, `libgcc` has been replaced with `libunwind`. This moves the linking of `libgcc`/`libunwind` into the `unwind` crate where we check if the system compiler can find `libunwind` and fall back to `libgcc` if needed.
This commit is contained in:
bors 2021-06-04 16:48:50 +00:00
commit efc4e377bf
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
library/std/src/sys/unix/mod.rs
View file

@ -210,7 +210,6 @@ cfg_if::cfg_if! {
if #[cfg(target_os = "android")] {
#[link(name = "dl")]
#[link(name = "log")]
#[link(name = "gcc")]
extern "C" {}
} else if #[cfg(target_os = "freebsd")] {
#[link(name = "execinfo")]