summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
index f69071ae96..20eb943d65 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
@@ -1,4 +1,4 @@
1From 9613e47bfdea18d2764eec130676e3e0b40c676f Mon Sep 17 00:00:00 2001 1From 13cbec5bc5c75dd4c3e1d5f3ca80e5b64f7116d1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Mar 2022 21:21:33 -0800 3Date: Thu, 10 Mar 2022 21:21:33 -0800
4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty 4Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/ld/ldelf.c b/ld/ldelf.c 16diff --git a/ld/ldelf.c b/ld/ldelf.c
17index 95787012b89..bc29909386f 100644 17index 1519f8ac4e5..2a7c76dc29c 100644
18--- a/ld/ldelf.c 18--- a/ld/ldelf.c
19+++ b/ld/ldelf.c 19+++ b/ld/ldelf.c
20@@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, 20@@ -1127,6 +1127,9 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
@@ -27,7 +27,7 @@ index 95787012b89..bc29909386f 100644
27 if (path 27 if (path
28 && ldelf_search_needed (path, &n, force, 28 && ldelf_search_needed (path, &n, force,
29 is_linux, elfsize)) 29 is_linux, elfsize))
30@@ -1801,6 +1804,8 @@ ldelf_before_allocation (char *audit, char *depaudit, 30@@ -1802,6 +1805,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
31 rpath = command_line.rpath; 31 rpath = command_line.rpath;
32 if (rpath == NULL) 32 if (rpath == NULL)
33 rpath = (const char *) getenv ("LD_RUN_PATH"); 33 rpath = (const char *) getenv ("LD_RUN_PATH");