| author | Michael Hope <michael.hope@linaro.org> |
| Thu Sep 29 12:40:42 2011 +1300 (2011-09-29) | |
| changeset 2695 | f2495884ca3e |
| permissions | -rw-r--r-- |
| yann@2665 | 1 |
diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em |
| yann@2665 | 2 |
--- binutils-2.21.1.orig/ld/emultempl/elf32.em 2011-06-27 09:39:14.000000000 +0200 |
| yann@2665 | 3 |
+++ binutils-2.21.1/ld/emultempl/elf32.em 2011-09-12 13:39:08.808908274 +0200 |
| yann@2665 | 4 |
@@ -1272,6 +1272,8 @@ |
| yann@2665 | 5 |
&& command_line.rpath == NULL) |
| yann@2665 | 6 |
{
|
| yann@2665 | 7 |
lib_path = (const char *) getenv ("LD_RUN_PATH");
|
| yann@2665 | 8 |
+ if ((lib_path) && (strlen (lib_path) == 0)) |
| yann@2665 | 9 |
+ lib_path = NULL; |
| yann@2665 | 10 |
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
|
| yann@2665 | 11 |
force)) |
| yann@2665 | 12 |
break; |
| yann@2665 | 13 |
@@ -1499,6 +1501,8 @@ |
| yann@2665 | 14 |
rpath = command_line.rpath; |
| yann@2665 | 15 |
if (rpath == NULL) |
| yann@2665 | 16 |
rpath = (const char *) getenv ("LD_RUN_PATH");
|
| yann@2665 | 17 |
+ if ((rpath) && (strlen (rpath) == 0)) |
| yann@2665 | 18 |
+ rpath = NULL; |
| yann@2665 | 19 |
|
| yann@2665 | 20 |
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) |
| yann@2665 | 21 |
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |