0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 9ae49e7b88c208ab79ec9c2fc4a2fa8a3f1e85bb Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Tue, 3 Mar 2015 08:21:19 +0000
  4. Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
  5. is provided
  6. http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
  7. Upstream-Status: Submitted
  8. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  9. ---
  10. ltmain.sh | 5 +++--
  11. 1 file changed, 3 insertions(+), 2 deletions(-)
  12. diff --git a/ltmain.sh b/ltmain.sh
  13. index 9ebc7e3d1e0..7ea79fa8be6 100644
  14. --- a/ltmain.sh
  15. +++ b/ltmain.sh
  16. @@ -6004,12 +6004,13 @@ func_mode_link ()
  17. fi
  18. else
  19. # We cannot seem to hardcode it, guess we'll fake it.
  20. + # Default if $libdir is not relative to the prefix:
  21. add_dir="-L$libdir"
  22. - # Try looking first in the location we're being installed to.
  23. +
  24. if test -n "$inst_prefix_dir"; then
  25. case $libdir in
  26. [\\/]*)
  27. - add_dir="$add_dir -L$inst_prefix_dir$libdir"
  28. + add_dir="-L$inst_prefix_dir$libdir"
  29. ;;
  30. esac
  31. fi