From 2b1326652faaaeb93a807d14c64e03da1f7cb314 Mon Sep 17 00:00:00 2001 From: viric Date: Sun, 26 Jul 2009 21:48:00 +0000 Subject: [PATCH] Updating to allow ld-linux.so.? interpreters, instead of always .so.2 git-svn-id: https://svn.nixos.org/repos/nix/nixpkgs/trunk@16465 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb --- pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index c1fa8582e..f51ce8b0b 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -10,15 +10,17 @@ echo Patching the bootstrap tools... # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So # use a copy of patchelf. -LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 $out/bin/cp $out/bin/patchelf . +LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf . +set +e for i in $out/bin/* $out/libexec/gcc/*/*/*; do echo patching $i if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ - ./patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ + ./patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i fi done +set -e # Fix the libc linker script. export PATH=$out/bin -- 2.11.4.GIT