Skip to content

Commit c1ef87e

Browse files
committed
stdenv bootstrap tools: adjust with glibc-2.34
https://hydra.nixos.org/build/171494041
1 parent 5e862dc commit c1ef87e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do
2929
./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
3030
done
3131

32+
# With glibc-2.34 the librt so-file is named a bit differently and doesn't need patchelfing.
3233
for i in $out/lib/librt-*.so $out/lib/libpcre*; do
33-
if [ -L "$i" ]; then continue; fi
34+
if [ -L "$i" ] || [ ! -e "$i" ]; then continue; fi
3435
echo patching "$i"
3536
$out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
3637
done

0 commit comments

Comments
 (0)