diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-11 22:52:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 22:52:58 +0200 |
| commit | 6737549aaf9e93bc444fc8409698d0cc1109457e (patch) | |
| tree | e1153a0900aa1ed432adef979490337b3cde1bac /library/std/src/sys | |
| parent | 9606408688df29931e68cadb1558b1f9740d3d9b (diff) | |
| parent | 874ee5bede53bf0c3ff55359df5fa5b04daa32d6 (diff) | |
| download | rust-6737549aaf9e93bc444fc8409698d0cc1109457e.tar.gz rust-6737549aaf9e93bc444fc8409698d0cc1109457e.zip | |
Rollup merge of #99421 - Bryanskiy:android-crt-static, r=petrochenkov
add crt-static for android
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/mod.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs index 3d0d91460f7..3a375093099 100644 --- a/library/std/src/sys/unix/mod.rs +++ b/library/std/src/sys/unix/mod.rs @@ -295,8 +295,10 @@ pub fn abort_internal() -> ! { cfg_if::cfg_if! { if #[cfg(target_os = "android")] { - #[link(name = "dl")] - #[link(name = "log")] + #[link(name = "dl", kind = "static", modifiers = "-bundle", + cfg(target_feature = "crt-static"))] + #[link(name = "dl", cfg(not(target_feature = "crt-static")))] + #[link(name = "log", cfg(not(target_feature = "crt-static")))] extern "C" {} } else if #[cfg(target_os = "freebsd")] { #[link(name = "execinfo")] |