[PATCH 04/12] ltmain.sh: Fix sysroot paths being encoded into RPATHs

[Richard Purdie]

There is a bug where RPATHs could end up containing sysroot values when
cross compiling which is obviously incorrect. Strip out sysroot components
from libdir when building RPATH values to avoid this.

Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
 build-aux/ltmain.in | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 2c994612..96238350 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -7654,9 +7654,11 @@ EOF
          test relink = "$opt_mode" || rpath=$compile_rpath$rpath
          for libdir in $rpath; do
            if test -n "$hardcode_libdir_flag_spec"; then
+             func_replace_sysroot "$libdir"
+             libdir=$func_replace_sysroot_result
+             func_stripname '=' '' "$libdir"
+             libdir=$func_stripname_result
              if test -n "$hardcode_libdir_separator"; then
-               func_replace_sysroot "$libdir"
-               libdir=$func_replace_sysroot_result
                if test -z "$hardcode_libdirs"; then
                  hardcode_libdirs=$libdir
                else
@@ -8386,6 +8388,10 @@ EOF
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
        if test -n "$hardcode_libdir_flag_spec"; then
+         func_replace_sysroot "$libdir"
+         libdir=$func_replace_sysroot_result
+         func_stripname '=' '' "$libdir"
+         libdir=$func_stripname_result
          if test -n "$hardcode_libdir_separator"; then
            if test -z "$hardcode_libdirs"; then
              hardcode_libdirs=$libdir
@@ -8437,6 +8443,10 @@ EOF
       hardcode_libdirs=
       for libdir in $finalize_rpath; do
        if test -n "$hardcode_libdir_flag_spec"; then
+         func_replace_sysroot "$libdir"
+         libdir=$func_replace_sysroot_result
+         func_stripname '=' '' "$libdir"
+         libdir=$func_stripname_result
          if test -n "$hardcode_libdir_separator"; then
            if test -z "$hardcode_libdirs"; then
              hardcode_libdirs=$libdir
-- 
2.25.1