about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-03 22:40:32 +0000
committerbors <bors@rust-lang.org>2016-02-03 22:40:32 +0000
commite3bcddb44bc810ddf5b0443e45e42a835d17d868 (patch)
treed1b24022bb34fe5a3d8851dee5b8a8291c47bb12 /src/libtest
parent18c1781a4c8aaaeb11285e0099edfff2043b62a5 (diff)
parentfae883c113031805cedb853c4176ecfef0b62bbc (diff)
downloadrust-e3bcddb44bc810ddf5b0443e45e42a835d17d868.tar.gz
rust-e3bcddb44bc810ddf5b0443e45e42a835d17d868.zip
Auto merge of #31078 - nbaksalyar:illumos, r=alexcrichton
This pull request adds support for [Illumos](http://illumos.org/)-based operating systems: SmartOS, OpenIndiana, and others. For now it's x86-64 only, as I'm not sure if 32-bit installations are widespread. This PR is based on #28589 by @potatosalad, and also closes #21000, #25845, and #25846.

Required changes in libc are already merged: https://github.com/rust-lang-nursery/libc/pull/138

Here's a snapshot required to build a stage0 compiler:
https://s3-eu-west-1.amazonaws.com/nbaksalyar/rustc-sunos-snapshot.tar.gz
It passes all checks from `make check`.

There are some changes I'm not quite sure about, e.g. macro usage in `src/libstd/num/f64.rs` and `DirEntry` structure in `src/libstd/sys/unix/fs.rs`, so any comments on how to rewrite it better would be greatly appreciated.

Also, LLVM configure script might need to be patched to build it successfully, or a pre-built libLLVM should be used. Some details can be found here: https://llvm.org/bugs/show_bug.cgi?id=25409

Thanks!

r? @brson
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 443356fbe7c..446e9798334 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -927,7 +927,8 @@ fn get_concurrency() -> usize {
     #[cfg(any(target_os = "linux",
               target_os = "macos",
               target_os = "ios",
-              target_os = "android"))]
+              target_os = "android",
+              target_os = "solaris"))]
     fn num_cpus() -> usize {
         unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as usize }
     }