Merge #1394

1394: illumos and Solaris support r=asomers a=jasonbking Adds support for the illumos target as well as improvements in the existing Solaris support. Co-authored-by: Dominik Hassler <[email protected]> Co-authored-by: Joshua M. Clulow <[email protected]> Co-authored-by: Jason King <[email protected]>
nix-rust · Mar 21, 2021 · fde9ebc · fde9ebc
2 parents 7b3129a + d444f1b
commit fde9ebc
Show file tree

Hide file tree

Showing 20 changed files with 671 additions and 111 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -182,6 +182,20 @@ task:
     # they don't build on all platforms.
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
+# illumos toolchain isn't available via rustup until 1.50
+task:
+  name: illumos
+  env:
+    TARGET: x86_64-unknown-illumos
+  container:
+    image: rust:1.50
+  setup_script:
+    - rustup target add $TARGET
+  script:
+    - cargo +$TOOLCHAIN check --target $TARGET
+    - cargo +$TOOLCHAIN check --target $TARGET --release
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
+
 # Redoxer is too unreliable, so we'll do a cross-build only
 # See also:
 # https://github.com/nix-rust/nix/issues/1258

diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,8 @@ targets = [
   "x86_64-unknown-netbsd",
   "x86_64-unknown-dragonfly",
   "x86_64-fuchsia",
-  "x86_64-unknown-redox"
+  "x86_64-unknown-redox",
+  "x86_64-unknown-illumos"
 ]
 
 [dependencies]

diff --git a/src/dir.rs b/src/dir.rs
@@ -192,6 +192,7 @@ impl Entry {
               target_os = "emscripten",
               target_os = "fuchsia",
               target_os = "haiku",
+              target_os = "illumos",
               target_os = "ios",
               target_os = "l4re",
               target_os = "linux",
@@ -206,6 +207,7 @@ impl Entry {
                   target_os = "emscripten",
                   target_os = "fuchsia",
                   target_os = "haiku",
+                  target_os = "illumos",
                   target_os = "ios",
                   target_os = "l4re",
                   target_os = "linux",
@@ -226,6 +228,7 @@ impl Entry {
     /// notably, some Linux filesystems don't implement this. The caller should use `stat` or
     /// `fstat` if this returns `None`.
     pub fn file_type(&self) -> Option<Type> {
+        #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
         match self.0.d_type {
             libc::DT_FIFO => Some(Type::Fifo),
             libc::DT_CHR => Some(Type::CharacterDevice),
@@ -236,5 +239,9 @@ impl Entry {
             libc::DT_SOCK => Some(Type::Socket),
             /* libc::DT_UNKNOWN | */ _ => None,
         }
+
+        // illumos and Solaris systems do not have the d_type member at all:
+        #[cfg(any(target_os = "illumos", target_os = "solaris"))]
+        None
     }
 }