Auto merge of #44060 - taleks:issue-43205, r=arielb1

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

diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
index 1ff0a1e19d7b312e6a3f12bfd3bdd60d577fab47..461b49aa363b4406716d1f2af76bb3e2a98abf4a 100644 (file)
--- a/src/libunwind/lib.rs
+++ b/src/libunwind/lib.rs
@@ -9,8 +9,6 @@
 // except according to those terms.
 
 #![no_std]
-#![crate_name = "unwind"]
-#![crate_type = "rlib"]
 #![unstable(feature = "panic_unwind", issue = "32837")]
 #![deny(warnings)]
 
@@ -30,7 +28,7 @@
 #[cfg(not(target_env = "msvc"))]
 pub use libunwind::*;
 
-#[cfg(target_env = "musl")]
-#[link(name = "unwind", kind = "static-nobundle", cfg(target_feature = "crt-static"))]
+#[cfg(all(target_env = "musl", not(target_arch = "mips")))]
+#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
 #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
 extern {}