mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-25 15:31:05 +00:00
793d65899f
Forward ported patches from binutils 2.34, refreshed to match current sources. Patch 0008-poison-system-directories.patch did not apply clean and had minor adjustments to fit new binutils 2.35 release. Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
25 lines
746 B
Diff
25 lines
746 B
Diff
---
|
|
ld/ldelf.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/ld/ldelf.c
|
|
+++ b/ld/ldelf.c
|
|
@@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int n
|
|
&& command_line.rpath == NULL)
|
|
{
|
|
path = (const char *) getenv ("LD_RUN_PATH");
|
|
+ if (path && *path == '\0')
|
|
+ path = NULL;
|
|
if (path
|
|
&& ldelf_search_needed (path, &n, force,
|
|
is_linux, elfsize))
|
|
@@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, ch
|
|
rpath = command_line.rpath;
|
|
if (rpath == NULL)
|
|
rpath = (const char *) getenv ("LD_RUN_PATH");
|
|
+ if (rpath && *rpath == '\0')
|
|
+ rpath = NULL;
|
|
|
|
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
|
|
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|