Merge branch 'musl-arm' of https://github.com/joerg-krause/libc into merge

2016-03-06 23:18:01 -08:00 · 2016-03-06 23:18:01 -08:00 · ba516ff2c2
parent 0b0a17d139 8ad252009a
commit ba516ff2c2
1 changed files with 2 additions and 1 deletions
--- 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")] {