| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From f68c5b78751660505b22b46dad99240db0df3456 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:29:11 +0400 |
| 4 | Subject: [PATCH 25/46] libtool |
| 5 | |
| 6 | libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 |
| 7 | when running on am x86_64 build host. |
| 8 | |
| 9 | This patch stops this speading to libdir in the libstdc++.la file within libtool. |
| 10 | Arguably, it shouldn't be passing this into libtool in the first place but |
| 11 | for now this resolves the nastiest problems this causes. |
| 12 | |
| 13 | func_normal_abspath would resolve an empty path to `pwd` so we need |
| 14 | to filter the zero case. |
| 15 | |
| 16 | RP 2012/8/24 |
| 17 | |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | |
| 20 | Upstream-Status: Pending |
| 21 | --- |
| 22 | ltmain.sh | 4 ++++ |
| 23 | 1 file changed, 4 insertions(+) |
| 24 | |
| 25 | diff --git a/ltmain.sh b/ltmain.sh |
| 26 | index 9503ec8..0121fba 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 | -- |
| 41 | 2.6.3 |
| 42 | |