From 05fc2a35240d4bdae638e273b56a2ff2722a40a9 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 18 Feb 2020 22:33:36 -0500 Subject: [PATCH] unpack-bootstrap-tools: remove obsolete linker script patching The linker scripts no longer contain store paths, so this does nothing. More importantly, libpthread.so is not longer a linker script on ARM, so the patching would corrupt it. --- .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index 64583f80fa8f..f394869ea915 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -35,12 +35,7 @@ for i in $out/lib/librt-*.so $out/lib/libpcre*; do $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done -# Fix the libc linker script. export PATH=$out/bin -cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp -mv $out/lib/libc.so.tmp $out/lib/libc.so -cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp -mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so # Provide some additional symlinks. ln -s bash $out/bin/sh