about summary refs log tree commit diff
path: root/pkgs/development/compilers/rust
diff options
context:
space:
mode:
authorWinter <winter@winter.cafe>2023-01-30 21:07:07 -0500
committerWinter <winter@winter.cafe>2023-01-30 21:13:05 -0500
commitede7b1d98a01cd25c05f30c215afc063bd62706b (patch)
tree15b3af946edb0859f7dbec8455b19b641658409c /pkgs/development/compilers/rust
parent63f869f5ff10b570fcf3a0d002a7aa25938f6f9f (diff)
downloadnixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar.gz
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar.bz2
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar.lz
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar.xz
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.tar.zst
nixlib-ede7b1d98a01cd25c05f30c215afc063bd62706b.zip
Revert "rustc: add note about libiconv dependency"
This reverts commit edfbbaf28258d968de64b364d4a0868a80cdf1c2.

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 b1834a461edf7abf4a6fb89db0ed65904a48a01c
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 https://github.com/rust-lang/libc/pull/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.
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 64254d502529..936ca31c5d6a 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -165,7 +165,6 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ openssl ]
-    # TODO: remove libiconv once 1.66 is used to bootstrap
     ++ optionals stdenv.isDarwin [ libiconv Security ]
     ++ optional (!withBundledLLVM) llvmShared;