Don't link util on musl, consolidate #[link]

rust-lang · May 13, 2016 · 437f580 · 437f580
1 parent 6598e2c
commit 437f580
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -670,7 +670,6 @@ pub const LOG_SECURITY: ::c_int = 13 << 3;
 pub const LOG_CONSOLE: ::c_int = 14 << 3;
 pub const LOG_NFACILITIES: ::c_int = 24;
 
-#[link(name = "util")]
 extern {
     pub fn getnameinfo(sa: *const ::sockaddr,
                        salen: ::socklen_t,

diff --git a/src/unix/bsd/openbsdlike/mod.rs b/src/unix/bsd/openbsdlike/mod.rs
@@ -447,7 +447,6 @@ pub const RTLD_GLOBAL: ::c_int = 0x100;
 
 pub const LOG_NFACILITIES: ::c_int = 24;
 
-#[link(name = "util")]
 extern {
     pub fn mincore(addr: *mut ::c_void, len: ::size_t,
                    vec: *mut ::c_char) -> ::c_int;

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -203,16 +203,21 @@ cfg_if! {
         extern {}
     } else if #[cfg(any(target_os = "macos",
                         target_os = "ios",
-                        target_os = "android",
-                        target_os = "openbsd",
+                        target_os = "android"))] {
+        #[link(name = "c")]
+        #[link(name = "m")]
+        extern {}
+    } else if #[cfg(any(target_os = "openbsd",
                         target_os = "bitrig"))] {
         #[link(name = "c")]
         #[link(name = "m")]
+        #[link(name = "util")]
         extern {}
     } else {
         #[link(name = "c")]
         #[link(name = "m")]
         #[link(name = "rt")]
+        #[link(name = "util")]
         extern {}
     }
 }

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
@@ -478,7 +478,6 @@ extern {
     static mut program_invocation_short_name: *mut ::c_char;
 }
 
-#[link(name = "util")]
 extern {
     pub fn shm_open(name: *const c_char, oflag: ::c_int,
                     mode: mode_t) -> ::c_int;