summaryrefslogtreecommitdiffstats
path: root/patches/binutils-2.32/0100-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
blob: 88f06c6e4f35df5e2c09bfc613b840c010aaa70b (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
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 1 Nov 2011 16:45:55 +0100
Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty, for
 cases where -rpath isn't specified.

This is http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=151024

This patch is still used in debian binutils 2.30-1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 ld/emultempl/elf32.em | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 1ad9d6b6fa81..d9b3d26b49f9 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1471,6 +1471,8 @@ fragment <<EOF
 	      && command_line.rpath == NULL)
 	    {
 	      path = (const char *) getenv ("LD_RUN_PATH");
+	      if ((path) && (strlen (path) == 0))
+		path = NULL;
 	      if (path
 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
 		break;
@@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void)
   rpath = command_line.rpath;
   if (rpath == NULL)
     rpath = (const char *) getenv ("LD_RUN_PATH");
+  if ((rpath) && (strlen (rpath) == 0))
+      rpath = NULL;
 
   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)