1From b19700ef0103f9414416b9a779a64d6138c58b1f Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Fri, 29 Mar 2013 09:29:11 +0400 4Subject: [PATCH] libtool 5 6libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 7when running on am x86_64 build host. 8 9This patch stops this speading to libdir in the libstdc++.la file within libtool. 10Arguably, it shouldn't be passing this into libtool in the first place but 11for now this resolves the nastiest problems this causes. 12 13func_normal_abspath would resolve an empty path to `pwd` so we need 14to filter the zero case. 15 16RP 2012/8/24 17 18Signed-off-by: Khem Raj <raj.khem@gmail.com> 19 20Upstream-Status: Pending 21--- 22 ltmain.sh | 4 ++++ 23 1 file changed, 4 insertions(+) 24 25diff --git a/ltmain.sh b/ltmain.sh 26index 70990740b6c..ee938056bef 100644 27--- a/ltmain.sh 28+++ b/ltmain.sh 29@@ -6359,6 +6359,10 @@ func_mode_link () 30 func_warning "ignoring multiple \`-rpath's for a libtool library" 31 32 install_libdir="$1" 33+ if test -n "$install_libdir"; then 34+ func_normal_abspath "$install_libdir" 35+ install_libdir=$func_normal_abspath_result 36+ fi 37 38 oldlibs= 39 if test -z "$rpath"; then 40