Imported Upstream version 1.1.0+dfsg1

[rustc.git] / src / libstd / rt / libunwind.rs

diff --git a/src/libstd/rt/libunwind.rs b/src/libstd/rt/libunwind.rs
index 4b754bd5f589f22ac3d957986a6fcc536769d9bf..8f75ae5ef5cc8441cd5b3e687a8465687e7928f1 100644 (file)
--- a/src/libstd/rt/libunwind.rs
+++ b/src/libstd/rt/libunwind.rs
@@ -97,10 +97,15 @@ pub type _Unwind_Exception_Cleanup_Fn =
         extern "C" fn(unwind_code: _Unwind_Reason_Code,
                       exception: *mut _Unwind_Exception);
 
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+#[cfg(any(all(target_os = "linux", not(target_env = "musl")),
+          target_os = "freebsd"))]
 #[link(name = "gcc_s")]
 extern {}
 
+#[cfg(all(target_os = "linux", target_env = "musl", not(test)))]
+#[link(name = "unwind", kind = "static")]
+extern {}
+
 #[cfg(any(target_os = "android", target_os = "openbsd"))]
 #[link(name = "gcc")]
 extern {}