Skip to content

Commit

Permalink
Auto merge of #44070 - smaeul:musl-libunwind, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Aug 25, 2017
2 parents c0771f2 + dbcaf6c commit 0cbe6d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libunwind/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

0 comments on commit 0cbe6d8

Please sign in to comment.