mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 12:57:53 +00:00
931b37a405
Forward ported patches from version 2.32, and refreshed them so they apply clean. Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
25 lines
772 B
Diff
25 lines
772 B
Diff
---
|
|
ld/emultempl/elf32.em | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/ld/emultempl/elf32.em
|
|
+++ b/ld/emultempl/elf32.em
|
|
@@ -1470,6 +1470,8 @@ fragment <<EOF
|
|
&& command_line.rpath == NULL)
|
|
{
|
|
path = (const char *) getenv ("LD_RUN_PATH");
|
|
+ if ((path) && (strlen (path) == 0))
|
|
+ path = NULL;
|
|
if (path
|
|
&& gld${EMULATION_NAME}_search_needed (path, &n, force))
|
|
break;
|
|
@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation (
|
|
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)
|