From e66ed266f84ef795a4a47b938253e25dc5f65b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 20:32:42 +0200 Subject: [PATCH] Revert "stdenv bootstrap tools: adjust with glibc-2.34" This reverts commit c1ef87e8d02273c9814444cedb3bac6669e07834. I didn't realize that it would rebuild all linux stdenvs; I certainly don't want to incur such a rebuild at this point. --- .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh | 3 +-- 1 file changed, 1 insertion(+), 2 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 8259ee2cafcd..f394869ea915 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -29,9 +29,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done -# With glibc-2.34 the librt so-file is named a bit differently and doesn't need patchelfing. for i in $out/lib/librt-*.so $out/lib/libpcre*; do - if [ -L "$i" ] || [ ! -e "$i" ]; then continue; fi + if [ -L "$i" ]; then continue; fi echo patching "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done