From 1cf98aec585e39a85b16dc182839cee3458c6e28 Mon Sep 17 00:00:00 2001 From: Alex Crichton <alex@alexcrichton.com> Date: Sun, 13 Sep 2015 11:19:02 -0700 Subject: [PATCH] Get MUSL working --- libc-test/build.rs | 6 ++++-- src/linuxlike/linux.rs | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 8858320b..de343db2 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -43,7 +43,7 @@ impl<'a> TestGenerator<'a> { let mut ret = Vec::new(); // Pull in extra goodies on linux - if self.target.contains("unknown-linux") { + if self.target.contains("unknown-linux-gnu") { ret.push("_GNU_SOURCE"); } @@ -211,8 +211,10 @@ impl<'a> TestGenerator<'a> { } else { panic!("unknown arch/pointer width: {}", self.target) }; - let (os, family, env) = if self.target.contains("unknown-linux") { + let (os, family, env) = if self.target.contains("unknown-linux-gnu") { ("linux", "unix", "gnu") + } else if self.target.contains("unknown-linux-musl") { + ("linux", "unix", "musl") } else if self.target.contains("apple-darwin") { ("macos", "unix", "") } else if self.target.contains("windows-msvc") { diff --git a/src/linuxlike/linux.rs b/src/linuxlike/linux.rs index 8f436ff1..09e7f7a7 100644 --- a/src/linuxlike/linux.rs +++ b/src/linuxlike/linux.rs @@ -120,6 +120,8 @@ pub const _SC_XOPEN_REALTIME_THREADS: ::c_int = 131; pub const RLIMIT_NLIMITS: ::c_int = 16; pub const RLIM_SAVED_MAX: ::rlim_t = ::RLIM_INFINITY; pub const RLIM_SAVED_CUR: ::rlim_t = ::RLIM_INFINITY; + +#[cfg(not(target_env = "musl"))] pub const RUSAGE_THREAD: ::c_int = 1; pub const GLOB_ERR: ::c_int = 1 << 0; -- GitLab