diff options
| author | bors <bors@rust-lang.org> | 2016-03-07 13:46:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-07 13:46:11 +0000 |
| commit | 2f34986eb0f14b3ce5e17db577abc632a9176380 (patch) | |
| tree | d3f8fc1f011dfce23ec9b0d21cb5e4eb76d05995 /src/libstd/sys | |
| parent | e079afa00b58f06de8e2a7596073045cd0983b7b (diff) | |
| parent | f164433a11bda8b61276f501983462d5dac743aa (diff) | |
| download | rust-2f34986eb0f14b3ce5e17db577abc632a9176380.tar.gz rust-2f34986eb0f14b3ce5e17db577abc632a9176380.zip | |
Auto merge of #32078 - japaric:rustbuild-i686-musl, r=alexcrichton
- make sure we copy the third party objects (crt*.o) to the target stage directory. - apply the x86_64-musl logic also to the i686-musl target. --- r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 3f70afe6ad7..c1e9782852a 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -106,9 +106,15 @@ pub type _Unwind_Exception_Cleanup_Fn = #[cfg_attr(any(all(target_os = "linux", not(target_env = "musl")), target_os = "freebsd", target_os = "solaris", - all(target_os = "linux", target_env = "musl", not(target_arch = "x86_64"))), + all(target_os = "linux", + target_env = "musl", + not(target_arch = "x86"), + not(target_arch = "x86_64"))), link(name = "gcc_s"))] -#[cfg_attr(all(target_os = "linux", target_env = "musl", target_arch = "x86_64", not(test)), +#[cfg_attr(all(target_os = "linux", + target_env = "musl", + any(target_arch = "x86", target_arch = "x86_64"), + not(test)), link(name = "unwind", kind = "static"))] #[cfg_attr(any(target_os = "android", target_os = "openbsd"), link(name = "gcc"))] |