benoit@2810: diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em
benoit@2810: --- binutils-2.22.orig/ld/emultempl/elf32.em	2011-11-21 10:29:39.000000000 +0100
benoit@2810: +++ binutils-2.22/ld/emultempl/elf32.em	2011-12-14 19:52:12.880783238 +0100
benoit@2810: @@ -1273,6 +1273,8 @@
benoit@2810:  	      && command_line.rpath == NULL)
benoit@2810:  	    {
benoit@2810:  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
benoit@2810: +	      if ((lib_path) && (strlen (lib_path) == 0))
benoit@2810: +	      	lib_path = NULL;
benoit@2810:  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
benoit@2810:  						      force))
benoit@2810:  		break;
benoit@2810: @@ -1500,6 +1502,8 @@
benoit@2810:    rpath = command_line.rpath;
benoit@2810:    if (rpath == NULL)
benoit@2810:      rpath = (const char *) getenv ("LD_RUN_PATH");
benoit@2810: +  if ((rpath) && (strlen (rpath) == 0))
benoit@2810: +  	rpath = NULL;
benoit@2810:  
benoit@2810:    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
benoit@2810:      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)