Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18.50.0.9/120-check-ldrunpath-length.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 26 22:43:08 2009 +0000 (2009-01-26)
changeset 1156 b8e4a98bbdf3
parent 747 d3e603e7c17c
permissions -rw-r--r--
Finally used the discovered paths from ./configure in scripts/crosstool-NG.sh:
- fix Makefile to really, really not used built-in rules and variables
- have scripts/crosstool-NG.sh generated from scripts/crosstool-NG.sh.in
- create a bin-overide directory ( in ${CT_WORK_DIR}/bin ) that contains shell wrappers to the actual discovered tools

/trunk/scripts/crosstool-NG.sh.in | 27 23 4 0 +++++++++++++++++++++---
/trunk/Makefile.in | 50 48 2 0 +++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 71 insertions(+), 6 deletions(-)
yann@652 
     1
 
diff -durN binutils-2.18.50.0.8.orig/ld/emultempl/elf32.em binutils-2.18.50.0.8/ld/emultempl/elf32.em
yann@652 
     2
 
--- binutils-2.18.50.0.8.orig/ld/emultempl/elf32.em	2008-07-10 17:33:23.000000000 +0200
yann@652 
     3
 
+++ binutils-2.18.50.0.8/ld/emultempl/elf32.em	2008-07-13 23:19:29.000000000 +0200
yann@652 
     4
 
@@ -1220,6 +1220,8 @@
yann@652 
     5
 
 	      && command_line.rpath == NULL)
yann@652 
     6
 
 	    {
yann@652 
     7
 
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@652 
     8
 
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@652 
     9
 
+		  lib_path = NULL;
yann@652 
    10
 
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@652 
    11
 
 						      force))
yann@652 
    12
 
 		break;
yann@652 
    13
 
@@ -1405,6 +1407,8 @@
yann@652 
    14
 
   rpath = command_line.rpath;
yann@652 
    15
 
   if (rpath == NULL)
yann@652 
    16
 
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@652 
    17
 
+  if ((rpath) && (strlen (rpath) == 0))
yann@652 
    18
 
+      rpath = NULL;
yann@652 
    19
 
   if (! (bfd_elf_size_dynamic_sections
yann@652 
    20
 
 	 (link_info.output_bfd, command_line.soname, rpath,
yann@652 
    21
 
 	  command_line.filter_shlib,
crosstool-ng