OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
bors 2017-08-25 00:04:06 +00:00
parent c0771f2190 dbcaf6c80a
commit 0cbe6d8fd6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libunwind/lib.rs
View File

@ -30,7 +30,7 @@ mod libunwind;
#[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 {}