From 1340814d0579ccacda757b2741226a7d3f739953 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Mon, 8 Jan 2024 04:35:51 +0900 Subject: [PATCH] Remove inconv linking on apple --- libc-test/semver/apple.txt | 3 --- src/unix/bsd/apple/mod.rs | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt index ce9c6097bbb88..e33b84e746769 100644 --- a/libc-test/semver/apple.txt +++ b/libc-test/semver/apple.txt @@ -1951,9 +1951,6 @@ getxattr glob glob_t globfree -iconv -iconv_close -iconv_open iconv_t id_t idtype_t diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 2e7827231e65f..d4d39b9419ece 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -6492,22 +6492,6 @@ cfg_if! { } } -// These require a dependency on `libiconv`, and including this when built as -// part of `std` means every Rust program gets it. Ideally we would have a link -// modifier to only include these if they are used, but we do not. -#[cfg_attr(not(feature = "rustc-dep-of-std"), link(name = "iconv"))] -extern "C" { - pub fn iconv_open(tocode: *const ::c_char, fromcode: *const ::c_char) -> iconv_t; - pub fn iconv( - cd: iconv_t, - inbuf: *mut *mut ::c_char, - inbytesleft: *mut ::size_t, - outbuf: *mut *mut ::c_char, - outbytesleft: *mut ::size_t, - ) -> ::size_t; - pub fn iconv_close(cd: iconv_t) -> ::c_int; -} - cfg_if! { if #[cfg(target_pointer_width = "32")] { mod b32;