Skip to content

Commit 878da35

Browse files
committed
Remove obsolete support for linking unwinder on Android
Linking libgcc is no longer supported (see rust-lang#103673), so remove the related link attributes and the check in unwind's build.rs. The check was the last remaining significant piece of logic in build.rs, so remove build.rs as well.
1 parent 722b3ee commit 878da35

File tree

2 files changed

+1
-30
lines changed

2 files changed

+1
-30
lines changed

Diff for: library/unwind/build.rs

-25
This file was deleted.

Diff for: library/unwind/src/lib.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,10 @@ cfg_if::cfg_if! {
7676
cfg_if::cfg_if! {
7777
if #[cfg(feature = "llvm-libunwind")] {
7878
compile_error!("`llvm-libunwind` is not supported for Android targets");
79-
} else if #[cfg(feature = "system-llvm-libunwind")] {
79+
} else {
8080
#[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
8181
#[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
8282
extern "C" {}
83-
} else {
84-
#[link(name = "gcc", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
85-
#[link(name = "gcc", cfg(not(target_feature = "crt-static")))]
86-
extern "C" {}
8783
}
8884
}
8985
// Android's unwinding library depends on dl_iterate_phdr in `libdl`.

0 commit comments

Comments
 (0)