Merge pull request rust-lang#22 from alexcrichton/musl-pthread

Be more selective about skipped pthread on musl tests
keeperofdakeys · Oct 30, 2015 · 171b05b · 171b05b
2 parents 1effc23 + 3a572fd
commit 171b05b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -200,7 +200,7 @@ fn main() {
             "SIG_IGN" => true, // sighandler_t weirdness
 
             // types on musl are defined a little differently
-            n if musl && n.contains("PTHREAD") => true,
+            n if musl && n.contains("__SIZEOF_PTHREAD") => true,
 
             _ => false,
         }

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
@@ -221,7 +221,9 @@ extern {
 }
 
 cfg_if! {
-    if #[cfg(any(target_arch = "arm", target_arch = "x86",
+    if #[cfg(any(target_env = "musl"))] {
+        pub const PTHREAD_STACK_MIN: ::size_t = 2048;
+    } else if #[cfg(any(target_arch = "arm", target_arch = "x86",
                  target_arch = "x86_64"))] {
         pub const PTHREAD_STACK_MIN: ::size_t = 16384;
     } else {