diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-29 23:46:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-29 23:46:00 +0000 |
| commit | 0ba8b50e834c2ede59d2940e4fc31a29ddda1386 (patch) | |
| tree | 3ab726a56511853698e073408c0a21beb35a732c /pkgs/stdenv | |
| parent | 52ac6f96aa53b2eb82405caaececbeb75bceccb5 (diff) | |
| download | nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar.gz nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar.bz2 nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar.lz nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar.xz nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.tar.zst nixlib-0ba8b50e834c2ede59d2940e4fc31a29ddda1386.zip | |
Fixing again about libstdc++.
I also move the 'echo patching' lines down, so they are printed only for files really patched.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh index 5b9d5db90815..afa949c5deb2 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh @@ -13,21 +13,21 @@ echo Patching the bootstrap tools... LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf . for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do - echo patching $i if test ${i%.la} != $i; then continue; fi if test ${i%*.so*} != $i; then continue; fi if ! test -f $i; then continue; fi if test -L $i; then continue; fi + echo patching $i LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i done for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp* \ - $out/lib/libstdc++*.so; do - echo patching $i + $out/lib/libstdc++*.so*[0-9]; do if ! test -f $i; then continue; fi if test -L $i; then continue; fi + echo patching $i LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ $out/bin/patchelf --set-rpath $out/lib --force-rpath $i LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \ |