musl bootstrap: remove libiconv
This commit is contained in:
parent
de00c0d7fb
commit
791b5bbbf4
@ -26,7 +26,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do
|
||||
./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
|
||||
done
|
||||
|
||||
for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do
|
||||
for i in $out/lib/libpcre* $out/lib/libc.so; do
|
||||
if [ -L "$i" ]; then continue; fi
|
||||
echo patching "$i"
|
||||
$out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
|
||||
|
@ -136,8 +136,6 @@ in with pkgs; rec {
|
||||
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
|
||||
cp -d ${zlib.out}/lib/libz.so* $out/lib
|
||||
cp -d ${libelf}/lib/libelf.so* $out/lib
|
||||
'' + lib.optionalString (hostPlatform.libc == "musl") ''
|
||||
cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib
|
||||
|
||||
'' + lib.optionalString (hostPlatform != buildPlatform) ''
|
||||
# These needed for cross but not native tools because the stdenv
|
||||
|
Loading…
Reference in New Issue
Block a user