Auto merge of #67732 - pietroalbini:fewer-apples, r=alexcrichton

[rust.git] / src / libunwind / lib.rs

diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
index b9ce71b6b847ec1dddc6bcb331d62ac1afe0ad8c..18d41be77398b5736fe29430964bb786b23105e9 100644 (file)
--- a/src/libunwind/lib.rs
+++ b/src/libunwind/lib.rs
@@ -1,12 +1,10 @@
 #![no_std]
 #![unstable(feature = "panic_unwind", issue = "32837")]
-
 #![feature(link_cfg)]
 #![feature(nll)]
 #![feature(staged_api)]
 #![feature(unwind_attributes)]
 #![feature(static_nobundle)]
-
 #![cfg_attr(not(target_env = "msvc"), feature(libc))]
 
 cfg_if::cfg_if! {
@@ -23,4 +21,9 @@
 #[cfg(target_env = "musl")]
 #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
 #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
-extern {}
+extern "C" {}
+
+#[cfg(target_os = "redox")]
+#[link(name = "gcc_eh", kind = "static-nobundle", cfg(target_feature = "crt-static"))]
+#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
+extern "C" {}