1From 5ce9e36a87974ce5c1c1adb6e4390350233d8770 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 18Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2023-04/msg00000.html] 19Signed-off-by: Khem Raj <raj.khem@gmail.com> 20--- 21 ltmain.sh | 4 ++++ 22 1 file changed, 4 insertions(+) 23 24diff --git a/ltmain.sh b/ltmain.sh 25index 70990740b6c..ee938056bef 100644 26--- a/ltmain.sh 27+++ b/ltmain.sh 28@@ -6359,6 +6359,10 @@ func_mode_link () 29 func_warning "ignoring multiple \`-rpath's for a libtool library" 30 31 install_libdir="$1" 32+ if test -n "$install_libdir"; then 33+ func_normal_abspath "$install_libdir" 34+ install_libdir=$func_normal_abspath_result 35+ fi 36 37 oldlibs= 38 if test -z "$rpath"; then 39