Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 79e53510b1f9e16a21db312698fb1c1c442481e7 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
| 4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not |
| 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 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 18 | index 1ad9d6b6fa..6a025a45b4 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 19 | --- a/ld/emultempl/elf32.em |
| 20 | +++ b/ld/emultempl/elf32.em |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | @@ -1471,6 +1471,8 @@ fragment <<EOF |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 22 | && command_line.rpath == NULL) |
| 23 | { |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 24 | 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 Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 29 | break; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 30 | @@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -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 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | 2.18.0 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 41 | |