| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From: Khem Raj <raj.khem@gmail.com> |
| 2 | Subject: [PATCH 03/12] ltmain.in: Add missing sysroot to library path |
| 3 | |
| 4 | When using a sysroot we should append it to libdir, which is helpful in |
| 5 | cross builds as the system is staged in the sysroot. For normal builds, |
| 6 | i.e. when lt_sysroot is not set, it will still behave the same and add |
| 7 | -L/usr/lib to the relink command. |
| 8 | |
| 9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 10 | |
| 11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] |
| 12 | |
| 13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 14 | index 3d5dcd0a..2c994612 100644 |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 15 | --- a/build-aux/ltmain.in |
| 16 | +++ b/build-aux/ltmain.in |
| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 17 | @@ -6475,7 +6475,7 @@ func_mode_link () |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 18 | fi |
| 19 | else |
| 20 | # We cannot seem to hardcode it, guess we'll fake it. |
| 21 | - add_dir=-L$libdir |
| 22 | + add_dir="-L$lt_sysroot$libdir" |
| 23 | # Try looking first in the location we're being installed to. |
| 24 | if test -n "$inst_prefix_dir"; then |
| 25 | case $libdir in |
| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 26 | -- |
| 27 | 2.25.1 |
| 28 | |