Fixes nix-rust#1116 - Feature flag and target_env check to selectivel…

…y include GNU function wrappers
shravanrn · Sep 1, 2019 · 34fbc5d · 34fbc5d
1 parent a4a465d
commit 34fbc5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,6 +36,9 @@ caps = "0.3.1"
 [target.'cfg(target_os = "freebsd")'.dev-dependencies]
 sysctl = "0.1"
 
+[features]
+exclude_gnu = []
+
 [[test]]
 name = "test"
 path = "test/test.rs"

diff --git a/src/sched.rs b/src/sched.rs
@@ -10,6 +10,7 @@ mod sched_linux_like {
     use libc::{self, c_int, c_void};
     use std::mem;
     use std::option::Option;
+    #[cfg(all(target_env = "gnu", not(feature = "exclude_gnu")))]
     use std::os::unix::io::RawFd;
     use unistd::Pid;
     use {Error, Result};
@@ -130,6 +131,7 @@ mod sched_linux_like {
         Errno::result(res).map(drop)
     }
 
+    #[cfg(all(target_env = "gnu", not(feature = "exclude_gnu")))]
     pub fn setns(fd: RawFd, nstype: CloneFlags) -> Result<()> {
         let res = unsafe { libc::setns(fd, nstype.bits()) };
 

diff --git a/src/sys/uio.rs b/src/sys/uio.rs
@@ -116,7 +116,7 @@ pub struct RemoteIoVec {
 /// [ptrace]: ../ptrace/index.html
 /// [`IoVec`]: struct.IoVec.html
 /// [`RemoteIoVec`]: struct.RemoteIoVec.html
-#[cfg(target_os = "linux")]
+#[cfg(all(target_env = "gnu", not(feature = "exclude_gnu")))]
 pub fn process_vm_writev(pid: ::unistd::Pid, local_iov: &[IoVec<&[u8]>], remote_iov: &[RemoteIoVec]) -> Result<usize> {
     let res = unsafe {
         libc::process_vm_writev(pid.into(),
@@ -147,7 +147,7 @@ pub fn process_vm_writev(pid: ::unistd::Pid, local_iov: &[IoVec<&[u8]>], remote_
 /// [`ptrace`]: ../ptrace/index.html
 /// [`IoVec`]: struct.IoVec.html
 /// [`RemoteIoVec`]: struct.RemoteIoVec.html
-#[cfg(any(target_os = "linux"))]
+#[cfg(all(target_env = "gnu", not(feature = "exclude_gnu")))]
 pub fn process_vm_readv(pid: ::unistd::Pid, local_iov: &[IoVec<&mut [u8]>], remote_iov: &[RemoteIoVec]) -> Result<usize> {
     let res = unsafe {
         libc::process_vm_readv(pid.into(),

diff --git a/test/sys/test_uio.rs b/test/sys/test_uio.rs
@@ -192,7 +192,7 @@ fn test_preadv() {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
+#[cfg(all(target_env = "gnu", not(feature = "exclude_gnu")))]
 // FIXME: qemu-user doesn't implement process_vm_readv/writev on most arches
 #[cfg_attr(not(any(target_arch = "x86", target_arch = "x86_64")), ignore)]
 fn test_process_vm_readv() {