From f05067545819e4312525560becbad7d284920547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Dec 2012 23:14:25 +0000 Subject: [PATCH] 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. --- pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh index 28c9b0dcd58..1224abdeefb 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