redox: convert to target_family unix

2 files changed, 6 insertions, 1 deletions

diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
index 3545a691a15..da31a49ddf2 100644
--- a/src/libunwind/build.rs
+++ b/src/libunwind/build.rs
@@ -40,7 +40,7 @@ fn main() {
     } else if target.contains("haiku") {
         println!("cargo:rustc-link-lib=gcc_s");
     } else if target.contains("redox") {
-        println!("cargo:rustc-link-lib=gcc");
+        // redox is handled in lib.rs
     } else if target.contains("cloudabi") {
         println!("cargo:rustc-link-lib=unwind");
     }
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
index b9ce71b6b84..8d916447128 100644
--- a/src/libunwind/lib.rs
+++ b/src/libunwind/lib.rs
@@ -24,3 +24,8 @@ cfg_if::cfg_if! {
 #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
 #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
 extern {}
+
+#[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 {}