Skip to content

Commit 0cbe6d8

Browse files
committed
Auto merge of #44070 - smaeul:musl-libunwind, r=alexcrichton
Do not assume libunwind.a is available on musl Fixes #40113, #44069, and clux/muslrust#16. libunwind.a is not copied from musl_root, so it must be integrated into the unwind crate.
2 parents c0771f2 + dbcaf6c commit 0cbe6d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/libunwind/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod libunwind;
3030
#[cfg(not(target_env = "msvc"))]
3131
pub use libunwind::*;
3232

33-
#[cfg(target_env = "musl")]
34-
#[link(name = "unwind", kind = "static-nobundle", cfg(target_feature = "crt-static"))]
33+
#[cfg(all(target_env = "musl", not(target_arch = "mips")))]
34+
#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
3535
#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
3636
extern {}

0 commit comments

Comments
 (0)