mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-29 00:58:51 +00:00
ba4cef6651
Support binutils 2.25.1 in configuration. Note: The patches do apply, but I didn't check the resulting tools. Signed-off-by: Jasmin Jessich <jasmin@anw.at>
23 lines
813 B
Diff
23 lines
813 B
Diff
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
|
|
index 137446f..bb8391a 100644
|
|
--- a/ld/emultempl/elf32.em
|
|
+++ b/ld/emultempl/elf32.em
|
|
@@ -1195,6 +1195,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;
|
|
@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
|
|
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)
|