mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 21:32:13 +02:00
918ba17f58
(From OE-Core rev: ae2b71ca2c73111a21845c2e1329ff973558991a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 9a296e537708296d32c07c1dc681f59de3d1acf9 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Thu, 10 Mar 2022 21:21:33 -0800
|
|
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 | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/ld/ldelf.c b/ld/ldelf.c
|
|
index 95787012b89..bc29909386f 100644
|
|
--- a/ld/ldelf.c
|
|
+++ b/ld/ldelf.c
|
|
@@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
|
&& 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))
|
|
@@ -1801,6 +1804,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)
|