diff options
| author | bors <bors@rust-lang.org> | 2017-08-25 00:04:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-25 00:04:06 +0000 |
| commit | 0cbe6d8fd6b22a1cb87de43fddbb3100ab0af04d (patch) | |
| tree | da2c14b8c29d4fc85c1054fb04d408e134ab709c | |
| parent | c0771f21901448bc4f695f287510ce7fdd8f4287 (diff) | |
| parent | dbcaf6c80aeb5be4fe09f157febc47bc52710616 (diff) | |
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.
| -rw-r--r-- | src/libunwind/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs index 1ff0a1e19d7..2f425d8e986 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs @@ -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 {} |