blob: 59150a2e4d2245459e690a423af5c0c605aa68dd [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 9d37c8f68c07da63186cb993f1221f6c11eca422 Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:27:17 +0000
4Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not
5 empty
6
7for cases where -rpath isn't specified. debian (#151024)
8
9Upstream-Status: Pending
10
11Signed-off-by: Chris Chimelis <chris@debian.org>
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 ld/emultempl/elf32.em | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
Brad Bishopd7bf8c12018-02-25 22:55:05 -050018index 9ac1840316..9dc4c149bc 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050019--- a/ld/emultempl/elf32.em
20+++ b/ld/emultempl/elf32.em
Brad Bishopd7bf8c12018-02-25 22:55:05 -050021@@ -1463,6 +1463,8 @@ fragment <<EOF
Brad Bishop6e60e8b2018-02-01 10:27:11 -050022 && command_line.rpath == NULL)
23 {
Brad Bishopd7bf8c12018-02-25 22:55:05 -050024 path = (const char *) getenv ("LD_RUN_PATH");
25+ if ((path) && (strlen (path) == 0))
26+ path = NULL;
27 if (path
28 && gld${EMULATION_NAME}_search_needed (path, &n, force))
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 break;
Brad Bishopd7bf8c12018-02-25 22:55:05 -050030@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050031 rpath = command_line.rpath;
32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH");
34+ if ((rpath) && (strlen (rpath) == 0))
35+ rpath = NULL;
36
37 for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
38 if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
39--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500402.14.0
Brad Bishop6e60e8b2018-02-01 10:27:11 -050041