Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From 59640ddf11104a604ccf7c078a48359d711c2f9c Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 06/17] Only generate an RPATH entry if LD_RUN_PATH is not |
| 5 | empty |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 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/ldelf.c | 4 ++++ |
| 15 | 1 file changed, 4 insertions(+) |
| 16 | |
| 17 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 18 | index b4784009d7a..541772f4604 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | --- a/ld/ldelf.c |
| 20 | +++ b/ld/ldelf.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 21 | @@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 22 | && command_line.rpath == NULL) |
| 23 | { |
| 24 | path = (const char *) getenv ("LD_RUN_PATH"); |
| 25 | + if ((path) && (strlen (path) == 0)) |
| 26 | + path = NULL; |
| 27 | if (path |
| 28 | && ldelf_search_needed (path, &n, force, |
| 29 | is_linux, elfsize)) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 30 | @@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -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) |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 39 | -- |
| 40 | 2.28.0 |
| 41 | |