[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8d5da8b108eb27a66f659c509a07bb3aab1839a6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 07:15:34 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 07:15:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8d5da8b1

scripts/bootstrap-prefix: also add rpath entries for special libdir

without this, at least on sparcv9 solaris 10 python won't start because it
can't find 64-bit libgcc_s.1.so

 scripts/bootstrap-prefix.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 02c7e45148..d5cad4d148 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -880,11 +880,13 @@ EOP
        case $CHOST in
                *-linux*)
                        # GNU ld
-                       export LDFLAGS="${LDFLAGS} 
-Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
+                       LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib 
${libdir}"
+                       LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}"
                ;;
                *-solaris*)
                        # Sun ld
-                       export LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib 
${libdir}"
+                       LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"
+                       LDFLAGS="${LDFLAGS} -R${libdir#-L}"
                ;;
        esac