diff options
| author | bors <bors@rust-lang.org> | 2016-03-04 21:01:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-04 21:01:14 +0000 |
| commit | da0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b (patch) | |
| tree | 1cabc62db300d796a2f0791375995a3c23ff67a1 /src/libstd | |
| parent | d31d8a9a919b705fb8d22ba99a693d9f96b8bdd5 (diff) | |
| parent | d5aeb769e998ed40a0dc935a0648f9bf1bd4292e (diff) | |
| download | rust-da0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b.tar.gz rust-da0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b.zip | |
Auto merge of #32046 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #32002, #32017, #32027, #32035, #32036 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/build.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs index a1144a964fd..c60ec4d3655 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -28,7 +28,7 @@ fn main() { } if target.contains("unknown-linux") { - if target.contains("musl") { + if target.contains("musl") && target.contains("x86_64") { println!("cargo:rustc-link-lib=static=unwind"); } else { println!("cargo:rustc-link-lib=dl"); |