about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-12-29 23:14:25 +0000
committerLluís Batlle i Rossell <viric@viric.name>2012-12-29 23:14:25 +0000
commitf05067545819e4312525560becbad7d284920547 (patch)
tree5eb3ebcfe2b5ee3e32a119f4fe3aeef77360594d /pkgs/stdenv
parenteb0422e4c1263a65a9b2b954fe10a1e03d67db3e (diff)
downloadnixlib-f05067545819e4312525560becbad7d284920547.tar
nixlib-f05067545819e4312525560becbad7d284920547.tar.gz
nixlib-f05067545819e4312525560becbad7d284920547.tar.bz2
nixlib-f05067545819e4312525560becbad7d284920547.tar.lz
nixlib-f05067545819e4312525560becbad7d284920547.tar.xz
nixlib-f05067545819e4312525560becbad7d284920547.tar.zst
nixlib-f05067545819e4312525560becbad7d284920547.zip
unpack bootstrap tools arm: fix more rpaths
libstdc++ and libmudflapth link to the dynamic loader; if the
bootstrap uses another dynamic loader name, and the rpath of these
libs isn't changed, they will fail to load.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
index 28c9b0dcd586..1224abdeefb9 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
@@ -23,7 +23,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do
     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*; do
+for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp* \
+      $out/lib/libstdc++* $out/lib/libmudflap*; do
     echo patching $i
     if ! test -f $i; then continue; fi
     if test -L $i; then continue; fi