| author | "Yann E. MORIN" <yann.morin.1998@free.fr> |
| Wed May 07 18:40:48 2014 +0200 (2014-05-07) | |
| changeset 3306 | 80e46e644bc0 |
| permissions | -rw-r--r-- |
| bryanhundven@3303 | 1 |
diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em |
| bryanhundven@3303 | 2 |
--- binutils-2.22.orig/ld/emultempl/elf32.em 2011-11-21 10:29:39.000000000 +0100 |
| bryanhundven@3303 | 3 |
+++ binutils-2.22/ld/emultempl/elf32.em 2011-12-14 19:52:12.880783238 +0100 |
| bryanhundven@3303 | 4 |
@@ -1273,6 +1273,8 @@ |
| bryanhundven@3303 | 5 |
&& command_line.rpath == NULL) |
| bryanhundven@3303 | 6 |
{
|
| bryanhundven@3303 | 7 |
lib_path = (const char *) getenv ("LD_RUN_PATH");
|
| bryanhundven@3303 | 8 |
+ if ((lib_path) && (strlen (lib_path) == 0)) |
| bryanhundven@3303 | 9 |
+ lib_path = NULL; |
| bryanhundven@3303 | 10 |
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
|
| bryanhundven@3303 | 11 |
force)) |
| bryanhundven@3303 | 12 |
break; |
| bryanhundven@3303 | 13 |
@@ -1500,6 +1502,8 @@ |
| bryanhundven@3303 | 14 |
rpath = command_line.rpath; |
| bryanhundven@3303 | 15 |
if (rpath == NULL) |
| bryanhundven@3303 | 16 |
rpath = (const char *) getenv ("LD_RUN_PATH");
|
| bryanhundven@3303 | 17 |
+ if ((rpath) && (strlen (rpath) == 0)) |
| bryanhundven@3303 | 18 |
+ rpath = NULL; |
| bryanhundven@3303 | 19 |
|
| bryanhundven@3303 | 20 |
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) |
| bryanhundven@3303 | 21 |
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |