Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.21.1a/300-012_check_ldrunpath_length.patch
author Andreas Bießmann <andreas@biessmann.de>
Tue Mar 18 17:01:10 2014 +0100 (2014-03-18)
changeset 3296 d3a628e69a46
permissions -rw-r--r--
configure.ac: respect 'g' variants of libtool/libtoolize

BSD OS'es (OS X for me) provide GNU tools with prefixed 'g'. To find correct
versions of libtool/libtoolize on those systems search also for
glibtool/glibtoolize.

Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: search for the g-variant first]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <2f1530b54afcb6a00e1d.1395158786@andreas-mbp.er.biessmann.org>
Patchwork-Id: 331467 
     1 diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em

     2 --- binutils-2.21.1.orig/ld/emultempl/elf32.em	2011-06-27 09:39:14.000000000 +0200

     3 +++ binutils-2.21.1/ld/emultempl/elf32.em	2011-09-12 13:39:08.808908274 +0200

     4 @@ -1272,6 +1272,8 @@

     5  	      && command_line.rpath == NULL)

     6  	    {

     7  	      lib_path = (const char *) getenv ("LD_RUN_PATH");

     8 +	      if ((lib_path) && (strlen (lib_path) == 0))

     9 +	      	lib_path = NULL;

    10  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,

    11  						      force))

    12  		break;

    13 @@ -1499,6 +1501,8 @@

    14    rpath = command_line.rpath;

    15    if (rpath == NULL)

    16      rpath = (const char *) getenv ("LD_RUN_PATH");

    17 +  if ((rpath) && (strlen (rpath) == 0))

    18 +  	rpath = NULL;

    19  

    20    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)

    21      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
crosstool-ng