alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

musl bootstrap: remove libiconv

Browse source
This commit is contained in:
Will Dietz 2018-04-24 21:22:52 -05:00
parent de00c0d7fb
commit 791b5bbbf4
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
View file

@ -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" ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
done 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 if [ -L "$i" ]; then continue; fi
echo patching "$i" echo patching "$i"
$out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -136,8 +136,6 @@ in with pkgs; rec {
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.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) '' '' + lib.optionalString (hostPlatform != buildPlatform) ''
# These needed for cross but not native tools because the stdenv # These needed for cross but not native tools because the stdenv