| From 42292f5533bca904f230a8e03ceee1f84ef0c4ec Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 2 Mar 2015 01:27:17 +0000 |
| Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not |
| empty |
| |
| for cases where -rpath isn't specified. debian (#151024) |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Chris Chimelis <chris@debian.org> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| ld/emultempl/elf32.em | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
| index 84adaef6df..ab8c74257e 100644 |
| --- a/ld/emultempl/elf32.em |
| +++ b/ld/emultempl/elf32.em |
| @@ -1411,6 +1411,8 @@ fragment <<EOF |
| && command_line.rpath == NULL) |
| { |
| lib_path = (const char *) getenv ("LD_RUN_PATH"); |
| + if ((lib_path) && (strlen (lib_path) == 0)) |
| + lib_path = NULL; |
| if (gld${EMULATION_NAME}_search_needed (lib_path, &n, |
| force)) |
| break; |
| @@ -1692,6 +1694,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) |
| -- |
| 2.12.0 |
| |