Skip to content

Commit ede7b1d

Browse files
committed
Revert "rustc: add note about libiconv dependency"
This reverts commit edfbbaf. I mistakingly believed that once 1.66.0 was used to bootstrap, we'd be able to remove libiconv from rustc's build-time dependency tree on Darwin. Sadly, this isn't the case, because src/tools/bootstrap depends on libc. Additionally, it seems that my assessment in b1834a4 was wrong -- *any* dependency on `libc` will cause a requirement on libiconv, due to rustc unconditionally linking every library specified in `link` directives, no matter if the function is actually used. This was worked around somewhat in rust-lang/libc#2944 by not linking libiconv if libc is only a dependency of std, but this doesn't apply when `libc` is a dependency of anything else. Maybe one day we'll just rip out libiconv from `libc` entirely (or hide it behind a feature flag), but for now, we can just keep it in `buildRustPackage`'s `buildInputs` by default.
1 parent 63f869f commit ede7b1d

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

pkgs/development/compilers/rust/rustc.nix

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ in stdenv.mkDerivation rec {
165165
];
166166

167167
buildInputs = [ openssl ]
168-
# TODO: remove libiconv once 1.66 is used to bootstrap
169168
++ optionals stdenv.isDarwin [ libiconv Security ]
170169
++ optional (!withBundledLLVM) llvmShared;
171170

0 commit comments

Comments
 (0)