mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #47352 - EdSchouten:cloudabi-libtest, r=kennytm

Browse Source 
Make libtest build on CloudABI.

Just like on UNIX systems, we need to use sysconf() to obtain the number
of CPUs. Extend the existing cfg()'s to match CloudABI as well.
This commit is contained in:
kennytm 2018-01-13 02:26:41 +08:00
commit a63121c59a
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtest/lib.rs
View File

@ -36,14 +36,14 @@
#![feature(asm)]
#![feature(fnbox)]
#![cfg_attr(unix, feature(libc))]
#![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc))]
#![feature(set_stdio)]
#![feature(panic_unwind)]
#![feature(staged_api)]
extern crate getopts;
extern crate term;
#[cfg(unix)]
#[cfg(any(unix, target_os = "cloudabi"))]
extern crate libc;
extern crate panic_unwind;
@ -1191,13 +1191,14 @@ fn num_cpus() -> usize {
1
}
#[cfg(any(target_os = "linux",
target_os = "macos",
target_os = "ios",
target_os = "android",
target_os = "solaris",
#[cfg(any(target_os = "android",
target_os = "cloudabi",
target_os = "emscripten",
target_os = "fuchsia"))]
target_os = "fuchsia",
target_os = "ios",
target_os = "linux",
target_os = "macos",
target_os = "solaris"))]
fn num_cpus() -> usize {
unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as usize }
}