From e79a4f8169e836c8deabca5a45884cfe11d07847 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:29:11 +0400 Subject: [PATCH 23/47] libtool 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. RP 2012/8/24 Signed-off-by: Khem Raj Upstream-Status: Pending --- ltmain.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ltmain.sh b/ltmain.sh index 9503ec85d70..0121fba707f 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.12.2