diff options
| author | Will Dietz <w@wdtz.org> | 2018-04-24 21:22:52 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-24 21:27:28 -0500 |
| commit | 791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9 (patch) | |
| tree | d2bdbff52dc31a70626b97eeeb40d2e63b698a18 | |
| parent | de00c0d7fbdbc27fd4a7a5addf5d42d3a90e3181 (diff) | |
| download | nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar.gz nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar.bz2 nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar.lz nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar.xz nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.tar.zst nixlib-791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9.zip | |
musl bootstrap: remove libiconv
| -rw-r--r-- | pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh index 8b5070dc6d6f..b160a748d8dc 100644 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh @@ -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" diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 5522bc5dea25..4fc9999b538c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -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 |