[patch] ld should search libs in sysroot first

binutils-2.19.1-ld-sysroot.patch (text/plain), 1.16 KB, created by Sven 'sleipnir' Rebhan on 2009-06-28 07:10:53 UTC

Signed-off-by: Sven Rebhan <[e-mail]>

Always try to prepend the sysroot prefix to absolute filenames first.

--- ld/ldfile.c	2009-06-14 12:46:19.000000000 +0200
+++ ld/ldfile.c.new	2009-06-14 12:46:04.000000000 +0200
@@ -308,18 +308,24 @@
      directory first.  */
   if (! entry->is_archive)
     {
-      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+      /* For absolute pathnames, try to always open the file in the
+	 sysroot first. If this fails, try to open the file at the
+	 given location. */
+      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
+      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
 	{
 	  char *name = concat (ld_sysroot, entry->filename,
 			       (const char *) NULL);
 	  if (ldfile_try_open_bfd (name, entry))
 	    {
 	      entry->filename = name;
+	      entry->sysrooted = TRUE;
 	      return TRUE;
 	    }
 	  free (name);
 	}
-      else if (ldfile_try_open_bfd (entry->filename, entry))
+
+      if (ldfile_try_open_bfd (entry->filename, entry))
 	{
 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
 	    && is_sysrooted_pathname (entry->filename, TRUE);