Skip to content

Commit 4a397ab

Browse files
committed
Auto merge of #287 - alexcrichton:no-util-on-musl, r=alexcrichton
Don't link util on musl, consolidate #[link]
2 parents 72519bf + 33fef10 commit 4a397ab

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed

src/unix/notbsd/linux/mips.rs

+1
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ pub const RTLD_NOLOAD: ::c_int = 0x8;
502502

503503
pub const SYS_gettid: ::c_long = 4222; // Valid for O32
504504

505+
#[link(name = "util")]
505506
extern {
506507
pub fn sysctl(name: *mut ::c_int,
507508
namelen: ::c_int,

src/unix/notbsd/linux/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ extern {
478478
static mut program_invocation_short_name: *mut ::c_char;
479479
}
480480

481-
#[link(name = "util")]
482481
extern {
483482
pub fn shm_open(name: *const c_char, oflag: ::c_int,
484483
mode: mode_t) -> ::c_int;

src/unix/notbsd/linux/other/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ cfg_if! {
469469
}
470470
}
471471

472+
#[link(name = "util")]
472473
extern {
473474
pub fn sysctl(name: *mut ::c_int,
474475
namelen: ::c_int,

0 commit comments

Comments
 (0)