diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 22:00:14 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 22:00:14 +0000 |
| commit | 9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9 (patch) | |
| tree | 264bc3be225816a2f1dcf5b7b34fdb72121407d1 /pkgs/stdenv | |
| parent | 0f4673788ef286ab623d95f407d08eb38d97f057 (diff) | |
| download | nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar.gz nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar.bz2 nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar.lz nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar.xz nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.tar.zst nixlib-9724fb271b4cdcd18b8ff9fc4d5ff934c328e2a9.zip | |
Fixing the unpack bootstrap tools script so it works not only for mips.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22855
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index da787d2036d3..b3f5dbb546db 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -8,35 +8,43 @@ $bzip2 -d < $tarball | (cd $out && $cpio -i) # Set the ELF interpreter / RPATH in the bootstrap binaries. echo Patching the bootstrap tools... +if test -f $out/lib/ld.so.?; then + # MIPS case + LD_BINARY=$out/lib/ld.so.? +else + # i686, x86_64 and armv5tel + LD_BINARY=$out/lib/ld-*so.? +fi + # 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.so.? $out/bin/cp $out/bin/patchelf . +LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . 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.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld.so.? --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld.so.? --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ + $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ + $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i fi done for i in $out/lib/librt* ; do echo patching $i if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $out/lib/ld.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld.so.? --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld.so.? \ - $out/bin/patchelf --set-interpreter $out/lib/ld.so.? --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ + $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ + $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i fi done for i in $out/lib/libgmp* $out/lib/libppl* $out/lib/libcloog* $out/lib/libmpc*; do - echo patching $i + echo trying to patch $i if test -f $i -a ! -L $i; then - LD_LIBRARY_PATH=$out/lib $out/lib/ld.so.? \ + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ $out/bin/patchelf --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $out/lib/ld.so.? \ + LD_LIBRARY_PATH=$out/lib $LD_BINARY \ $out/bin/patchelf --set-rpath $out/lib --force-rpath $i fi done |