Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From c008c7f97c1cf487749c6c375820a1f3b3c6c53d Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4 | Subject: [PATCH 04/14] Only generate an RPATH entry if LD_RUN_PATH is not |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | empty |
| 6 | |
| 7 | for cases where -rpath isn't specified. debian (#151024) |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Chris Chimelis <chris@debian.org> |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | ld/emultempl/elf32.em | 4 ++++ |
| 15 | 1 file changed, 4 insertions(+) |
| 16 | |
| 17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18 | index 0405d4f..73c5447 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19 | --- a/ld/emultempl/elf32.em |
| 20 | +++ b/ld/emultempl/elf32.em |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 21 | @@ -1242,6 +1242,8 @@ fragment <<EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | && command_line.rpath == NULL) |
| 23 | { |
| 24 | lib_path = (const char *) getenv ("LD_RUN_PATH"); |
| 25 | + if ((lib_path) && (strlen (lib_path) == 0)) |
| 26 | + lib_path = NULL; |
| 27 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, |
| 28 | force)) |
| 29 | break; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 30 | @@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | 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 | -- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 40 | 2.7.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 41 | |