mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
30ab044dac
(From OE-Core rev: 3f1eb2556026572dca9476c561d89b86723395c7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 4ff83779de8621715c6c2a79cf7ed8d74ff2d7c5 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 04/13] 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 47fa549..f4c640e 100644
|
|
--- a/ld/emultempl/elf32.em
|
|
+++ b/ld/emultempl/elf32.em
|
|
@@ -1244,6 +1244,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;
|
|
@@ -1525,6 +1527,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.9.0
|
|
|