summaryrefslogtreecommitdiff
path: root/patches/binutils/2.21.1a/300-012_check_ldrunpath_length.patch
blob: 1c5393a821197eb35429197bff79754e4f6f4d87 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em
--- binutils-2.21.1.orig/ld/emultempl/elf32.em	2011-06-27 09:39:14.000000000 +0200
+++ binutils-2.21.1/ld/emultempl/elf32.em	2011-09-12 13:39:08.808908274 +0200
@@ -1272,6 +1272,8 @@
 	      && 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;
@@ -1499,6 +1501,8 @@
   rpath = command_line.rpath;
   if (rpath == NULL)
     rpath = (const char *) getenv ("LD_RUN_PATH");
+  if ((rpath) && (strlen (rpath) == 0))
+  	rpath = NULL;
 
   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)