summaryrefslogtreecommitdiff
path: root/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-6.2/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch
blob: e425d71463bf18bf6de1f513ec0722f49f76462b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 5092f5389d02e78cd59690cf3fca24b56a97aff2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 3 Mar 2015 08:21:19 +0000
Subject: [PATCH 33/46] Don't search host directory during "relink" if
 $inst_prefix is provided

http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html

Upstream-Status: Submitted

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ltmain.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ltmain.sh b/ltmain.sh
index 52bdbdb..82bcec3 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6004,12 +6004,13 @@ func_mode_link ()
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
+	      # Default if $libdir is not relative to the prefix:
 	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
+
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    add_dir="-L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
-- 
2.8.2