From c6d891e168f05e5b18a31daa136270772bf4916d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 19 Apr 2019 13:40:48 -0600
Subject: [PATCH] Link to gcc_eh for static unwind support on Redox
---
src/libunwind/lib.rs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
index 1cff0a6b1684..ab901fe063be 100644
--- a/src/libunwind/lib.rs
+++ b/src/libunwind/lib.rs
@@ -25,7 +25,12 @@
}
}
-#[cfg(any(target_env = "musl", target_os = "redox"))]
+#[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 {}
+
+#[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 {}
--
GitLab