diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 726f7020dd..59150a2e4d 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 42292f5533bca904f230a8e03ceee1f84ef0c4ec Mon Sep 17 00:00:00 2001 | 1 | From 9d37c8f68c07da63186cb993f1221f6c11eca422 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 | 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not | 4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not |
@@ -15,19 +15,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
16 | 16 | ||
17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em | 17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
18 | index 84adaef6df..ab8c74257e 100644 | 18 | index 9ac1840316..9dc4c149bc 100644 |
19 | --- a/ld/emultempl/elf32.em | 19 | --- a/ld/emultempl/elf32.em |
20 | +++ b/ld/emultempl/elf32.em | 20 | +++ b/ld/emultempl/elf32.em |
21 | @@ -1411,6 +1411,8 @@ fragment <<EOF | 21 | @@ -1463,6 +1463,8 @@ fragment <<EOF |
22 | && command_line.rpath == NULL) | 22 | && command_line.rpath == NULL) |
23 | { | 23 | { |
24 | lib_path = (const char *) getenv ("LD_RUN_PATH"); | 24 | path = (const char *) getenv ("LD_RUN_PATH"); |
25 | + if ((lib_path) && (strlen (lib_path) == 0)) | 25 | + if ((path) && (strlen (path) == 0)) |
26 | + lib_path = NULL; | 26 | + path = NULL; |
27 | if (gld${EMULATION_NAME}_search_needed (lib_path, &n, | 27 | if (path |
28 | force)) | 28 | && gld${EMULATION_NAME}_search_needed (path, &n, force)) |
29 | break; | 29 | break; |
30 | @@ -1692,6 +1694,8 @@ gld${EMULATION_NAME}_before_allocation (void) | 30 | @@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
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"); |
@@ -37,5 +37,5 @@ index 84adaef6df..ab8c74257e 100644 | |||
37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | 39 | -- |
40 | 2.12.0 | 40 | 2.14.0 |
41 | 41 | ||