Auto merge of #526 - Fulkerson:master, r=posborne

Remove EPOLLWAKEUP and SIGEV_THREAD_ID when cross-compiling to MIPS. With this nix builds for mipsel-unknown-linux-gnu.
nix-rust · Feb 25, 2017 · 4ab234c · 4ab234c
2 parents cb1c915 + 965341c
commit 4ab234c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs
@@ -20,6 +20,7 @@ libc_bitflags!(
         EPOLLRDHUP,
         #[cfg(target_os = "linux")]  // Added in 4.5; not in Android.
         EPOLLEXCLUSIVE,
+        #[cfg(not(target_arch = "mips"))]
         EPOLLWAKEUP,
         EPOLLONESHOT,
         EPOLLET,

diff --git a/src/sys/signal.rs b/src/sys/signal.rs
@@ -467,9 +467,9 @@ impl SigEvent {
             SigevNotify::SigevKevent{..} => libc::SIGEV_KEVENT,
             #[cfg(target_os = "freebsd")]
             SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
-            #[cfg(all(target_os = "linux", target_env = "gnu"))]
+            #[cfg(all(target_os = "linux", target_env = "gnu", not(target_arch = "mips")))]
             SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
-            #[cfg(all(target_os = "linux", target_env = "musl"))]
+            #[cfg(any(all(target_os = "linux", target_env = "musl"), target_arch = "mips"))]
             SigevNotify::SigevThreadId{..} => 4  // No SIGEV_THREAD_ID defined
         };
         sev.sigev_signo = match sigev_notify {