summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-03-06 23:18:01 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-03-06 23:18:01 -0800
commitba516ff2c2762c831fff39412c7e9751175e7e5b (patch)
tree35383191d63dc32781b6fb49c2de5a29d5b7fe81
parent0b0a17d139f386b6b2e0c2f8193d319858a59142 (diff)
parent8ad252009a833ebf4ba006375a83a06f415bae85 (diff)
downloadrust-libc-ba516ff2c2762c831fff39412c7e9751175e7e5b.tar.gz
Merge branch 'musl-arm' of https://github.com/joerg-krause/libc into merge
-rw-r--r--src/unix/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 0f7083447b..6176402fb0 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -139,7 +139,8 @@ cfg_if! {
if #[cfg(not(stdbuild))] {
// cargo build, don't pull in anything extra as the libstd dep
// already pulls in all libs.
- } else if #[cfg(all(target_env = "musl", not(target_arch = "mips")))] {
+ } else if #[cfg(all(target_env = "musl", not(any(target_arch = "mips",
+ target_arch = "arm"))))] {
#[link(name = "c", kind = "static")]
extern {}
} else if #[cfg(target_os = "emscripten")] {