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

bors · bors · commit 4a397ab06b16 · 2016-05-14T17:31:55.000-07:00
Don't link util on musl, consolidate #[link]
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,

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,6 @@ extern {`
`478`	`478`	`static mut program_invocation_short_name: *mut ::c_char;`
`479`	`479`	`}`
`480`	`480`
`481`		`-#[link(name = "util")]`
`482`	`481`	`extern {`
`483`	`482`	`pub fn shm_open(name: *const c_char, oflag: ::c_int,`
`484`	`483`	`mode: mode_t) -> ::c_int;`