Auto merge of #2944 - thomcc:apple-iconv, r=JohnTitor

bors · bors · commit 8501d724da78 · 2022-10-09T02:18:30.000Z
Don't link against iconv on apple targets when used by `std` See #2870 (and specifically my, erm, rant in #2870 (comment)). I think we should probably remove it outright, but we definitely shouldn't have it in every Rust program by giving it to `std`. FIxes #2870
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -5873,7 +5873,10 @@ cfg_if! {
     }
 }
 
-#[link(name = "iconv")]
+// 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(

Original file line number	Diff line number	Diff line change
`@@ -5873,7 +5873,10 @@ cfg_if! {`
`5873`	`5873`	`}`
`5874`	`5874`	`}`
`5875`	`5875`
`5876`		`-#[link(name = "iconv")]`
	`5876`	+// These require a dependency on `libiconv`, and including this when built as
	`5877`	+// part of `std` means every Rust program gets it. Ideally we would have a link
	`5878`	`+// modifier to only include these if they are used, but we do not.`
	`5879`	`+#[cfg_attr(not(feature = "rustc-dep-of-std"), link(name = "iconv"))]`
`5877`	`5880`	`extern "C" {`
`5878`	`5881`	`pub fn iconv_open(tocode: const ::c_char, fromcode: const ::c_char) -> iconv_t;`
`5879`	`5882`	`pub fn iconv(`