Auto merge of #287 - alexcrichton:no-util-on-musl, r=alexcrichton

Don't link util on musl, consolidate #[link]
rust-lang · May 13, 2016 · b14c5c3 · b14c5c3
2 parents 81e3af2 + 33fef10
commit b14c5c3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/src/unix/notbsd/linux/mips.rs b/src/unix/notbsd/linux/mips.rs
@@ -502,6 +502,7 @@ pub const RTLD_NOLOAD: ::c_int = 0x8;
 
 pub const SYS_gettid: ::c_long = 4222;   // Valid for O32
 
+#[link(name = "util")]
 extern {
     pub fn sysctl(name: *mut ::c_int,
                   namelen: ::c_int,

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;

diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
@@ -469,6 +469,7 @@ cfg_if! {
     }
 }
 
+#[link(name = "util")]
 extern {
     pub fn sysctl(name: *mut ::c_int,
                   namelen: ::c_int,