12345678910111213141516171819202122232425262728293031323334353637 |
- From 29517900352336708495d41902b5b7e8cc9a401a 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] 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/ldelf.c | 4 ++++
- 1 file changed, 4 insertions(+)
- diff --git a/ld/ldelf.c b/ld/ldelf.c
- index d1615003ede..6a894285b11 100644
- --- a/ld/ldelf.c
- +++ b/ld/ldelf.c
- @@ -1250,6 +1250,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
- && command_line.rpath == NULL)
- {
- path = (const char *) getenv ("LD_RUN_PATH");
- + if ((path) && (strlen (path) == 0))
- + path = NULL;
- if (path
- && ldelf_search_needed (path, &n, force,
- is_linux, elfsize))
- @@ -1610,6 +1612,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
- 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)
|