Re: bin/47922 (build fail/risk building 6.1.x on 6.99.x>19 (ld picks wrong lib))

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

The following reply was made to PR bin/47922; it has been noted by GNATS.

From: Joerg Sonnenberger <joerg%britannica.bec.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: bin/47922 (build fail/risk building 6.1.x on 6.99.x>19 (ld picks
 wrong lib))
Date: Mon, 24 Jun 2013 22:07:27 +0200

 --Kj7319i9nmIyA2yE
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Please try the following patch.
 
 Joerg
 
 --Kj7319i9nmIyA2yE
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="elf32.em.diff"
 
 Index: elf32.em
 ===================================================================
 RCS file: 
/home/joerg/repo/netbsd/src/external/gpl3/binutils/dist/ld/emultempl/elf32.em,v
 retrieving revision 1.5
 diff -u -p -r1.5 elf32.em
 --- elf32.em   7 Aug 2012 01:09:13 -0000       1.5
 +++ elf32.em   24 Jun 2013 20:03:09 -0000
 @@ -310,11 +310,17 @@ gld${EMULATION_NAME}_try_needed (struct 
                                 int force)
  {
    bfd *abfd;
 -  const char *name = needed->name;
 +  char *name;
    const char *soname;
    int link_class;
  
 +  if (ld_sysroot)
 +    name = concat(ld_sysroot, "/", needed->name, (const char *)NULL);
 +  else
 +    name = needed->name;
    abfd = bfd_openr (name, bfd_get_target (link_info.output_bfd));
 +  if (ld_sysroot)
 +    free(name);
    if (abfd == NULL)
      return FALSE;
  
 
 --Kj7319i9nmIyA2yE--