Skip to content

Commit

Permalink
Auto merge of #3526 - JohnTitor:rm-iconv-apple, r=JohnTitor
Browse files Browse the repository at this point in the history
Remove inconv linking on apple

Closes #3097
  • Loading branch information
bors committed Jan 7, 2024
2 parents b55a097 + 1340814 commit e4c0b68
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
3 changes: 0 additions & 3 deletions libc-test/semver/apple.txt
Expand Up @@ -1951,9 +1951,6 @@ getxattr
glob
glob_t
globfree
iconv
iconv_close
iconv_open
iconv_t
id_t
idtype_t
Expand Down
16 changes: 0 additions & 16 deletions src/unix/bsd/apple/mod.rs
Expand Up @@ -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;
Expand Down

0 comments on commit e4c0b68

Please sign in to comment.