From: Khem Raj <raj.k...@gmail.com>

libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for 
qemux86-64
when running on am x86_64 build host.

This patch stops this speading to libdir in the libstdc++.la file within 
libtool.
Arguably, it shouldn't be passing this into libtool in the first place but
for now this resolves the nastiest problems this causes.

func_normal_abspath would resolve an empty path to `pwd` so we need
to filter the zero case.

Signed-off-by: Khem Raj <raj.k...@gmail.com>
Signed-off-by: Yash Shinde <yash.shi...@windriver.com>
---
 ltmain.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ltmain.sh b/ltmain.sh
index 70990740b6c..a5bb36a364e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6359,6 +6359,10 @@ func_mode_link ()
        func_warning "ignoring multiple \`-rpath's for a libtool library"
 
       install_libdir="$1"
+      if test -n "$install_libdir"; then
+       func_normal_abspath "$install_libdir"
+       install_libdir=$func_normal_abspath_result
+      fi
 
       oldlibs=
       if test -z "$rpath"; then
-- 
2.34.1


Reply via email to