pyrox.dev
musl bootstrap: remove libiconv
+1
-1
pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
+1
-1
pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
···
26
26
./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
27
27
done
28
28
29
-
for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do
29
+
for i in $out/lib/libpcre* $out/lib/libc.so; do
30
30
if [ -L "$i" ]; then continue; fi
31
31
echo patching "$i"
32
32
$out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
-2
pkgs/stdenv/linux/make-bootstrap-tools.nix
-2
pkgs/stdenv/linux/make-bootstrap-tools.nix
···
136
136
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
137
137
cp -d ${zlib.out}/lib/libz.so* $out/lib
138
138
cp -d ${libelf}/lib/libelf.so* $out/lib
139
-
'' + lib.optionalString (hostPlatform.libc == "musl") ''
140
-
cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib
141
139
142
140
'' + lib.optionalString (hostPlatform != buildPlatform) ''
143
141
# These needed for cross but not native tools because the stdenv