diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2021-01-28 00:21:42 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2021-01-28 00:21:42 -0800 |
| commit | 6859d47e78c44eae0b9ffed1e2031ecdf8bf3152 (patch) | |
| tree | f0aecb35130eddc94052d5c32fc34bb761071dfc | |
| parent | 389026982d8821b114a39162f59ff1fd397b8f89 (diff) | |
| download | rust-libc-6859d47e78c44eae0b9ffed1e2031ecdf8bf3152.tar.gz | |
Remove link directives for libutil on linux-gnu targets
These are all handled in src/unix/mod.rs now, which also addresses the
crt-static case; no linux-gnu target should have any link directives in
any other module.
This fixes static linking with glibc for various architectures.
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b32/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b64/mips64/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b64/s390x.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs index 5e0076ea84..c7fa1a8a28 100644 --- a/src/unix/linux_like/linux/gnu/b32/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/mod.rs @@ -321,7 +321,6 @@ pub const PTRACE_SETREGS: ::c_uint = 13; pub const TIOCSBRK: ::c_int = 0x5427; pub const TIOCCBRK: ::c_int = 0x5428; -#[link(name = "util")] extern "C" { pub fn sysctl( name: *mut ::c_int, diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs index e62800f67c..e9a06c7718 100644 --- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs @@ -979,7 +979,6 @@ pub const SYS_statx: ::c_long = 291; pub const SYS_pidfd_open: ::c_long = 434; pub const SYS_clone3: ::c_long = 435; -#[link(name = "util")] extern "C" { pub fn sysctl( name: *mut ::c_int, diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs index ed279ebdc0..ca82528935 100644 --- a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs @@ -1004,7 +1004,6 @@ pub const TIOCM_DSR: ::c_int = 0x400; pub const EHWPOISON: ::c_int = 168; -#[link(name = "util")] extern "C" { pub fn sysctl( name: *mut ::c_int, diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs index 57c3cff47f..efdbda9172 100644 --- a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs @@ -1046,7 +1046,6 @@ pub const SYS_statx: ::c_long = 383; pub const SYS_pidfd_open: ::c_long = 434; pub const SYS_clone3: ::c_long = 435; -#[link(name = "util")] extern "C" { pub fn sysctl( name: *mut ::c_int, diff --git a/src/unix/linux_like/linux/gnu/b64/s390x.rs b/src/unix/linux_like/linux/gnu/b64/s390x.rs index cf951d1e0d..fcd1f7b16f 100644 --- a/src/unix/linux_like/linux/gnu/b64/s390x.rs +++ b/src/unix/linux_like/linux/gnu/b64/s390x.rs @@ -1010,7 +1010,6 @@ pub const SYS_statx: ::c_long = 379; pub const SYS_pidfd_open: ::c_long = 434; pub const SYS_clone3: ::c_long = 435; -#[link(name = "util")] extern "C" { pub fn sysctl( diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs index 00a10fa560..0d14e71967 100644 --- a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs @@ -977,7 +977,6 @@ pub const SYS_pidfd_open: ::c_long = 434; // Reserved in the kernel, but not actually implemented yet pub const SYS_clone3: ::c_long = 435; -#[link(name = "util")] extern "C" { pub fn sysctl( name: *mut ::c_int, |