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 7fa2ce650fd6cea7d98459c612a85176047673a9..461b49aa363b4406716d1f2af76bb3e2a98abf4a 100644 (file)
--- a/src/libunwind/lib.rs
+++ b/src/libunwind/lib.rs
@@ -9,14 +9,14 @@
 // except according to those terms.
 
 #![no_std]
-#![crate_name = "unwind"]
-#![crate_type = "rlib"]
 #![unstable(feature = "panic_unwind", issue = "32837")]
 #![deny(warnings)]
 
 #![feature(cfg_target_vendor)]
+#![feature(link_cfg)]
 #![feature(staged_api)]
 #![feature(unwind_attributes)]
+#![feature(static_nobundle)]
 
 #![cfg_attr(not(target_env = "msvc"), feature(libc))]
 
@@ -27,3 +27,8 @@
 mod libunwind;
 #[cfg(not(target_env = "msvc"))]
 pub use libunwind::*;
+
+#[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 {}