Merge pull request #22 from alexcrichton/musl-pthread

Be more selective about skipped pthread on musl tests
This commit is contained in:
Alex Crichton 2015-10-30 09:23:30 -07:00
commit 171b05b53b
2 changed files with 4 additions and 2 deletions

View File

@ -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,
}

View File

@ -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 {