yann@2665: diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em
yann@2665: --- binutils-2.21.1.orig/ld/emultempl/elf32.em	2011-06-27 09:39:14.000000000 +0200
yann@2665: +++ binutils-2.21.1/ld/emultempl/elf32.em	2011-09-12 13:39:08.808908274 +0200
yann@2665: @@ -1272,6 +1272,8 @@
yann@2665:  	      && command_line.rpath == NULL)
yann@2665:  	    {
yann@2665:  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@2665: +	      if ((lib_path) && (strlen (lib_path) == 0))
yann@2665: +	      	lib_path = NULL;
yann@2665:  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@2665:  						      force))
yann@2665:  		break;
yann@2665: @@ -1499,6 +1501,8 @@
yann@2665:    rpath = command_line.rpath;
yann@2665:    if (rpath == NULL)
yann@2665:      rpath = (const char *) getenv ("LD_RUN_PATH");
yann@2665: +  if ((rpath) && (strlen (rpath) == 0))
yann@2665: +  	rpath = NULL;
yann@2665:  
yann@2665:    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
yann@2665:      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)