* ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0ee2ed7fc9aa461d703f5f69aaca26f92bb56716..8ea6f6d92da6b941cb612b6444be6976b5e0ac8e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Alan Modra  <amodra@gmail.com>
+
+       * ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR.
+
 2010-10-28  Matthias Klose  <doko@ubuntu.com>
 
        * ld.texinfo: Add directory section for info document.

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 2695905a3cc8c6ae4969a7f094925d14ba86b513..1732885fccecbdaaf65f8ee1419046b5a8f9aabd 100644 (file)
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -547,7 +547,6 @@ check_for_scripts_dir (char *dir)
 
    SCRIPTDIR (passed from Makefile)
             (adjusted according to the current location of the binary)
-   SCRIPTDIR (passed from Makefile)
    the dir where this program is (for using it from the build tree).  */
 
 static char *
@@ -571,10 +570,6 @@ find_scripts_dir (void)
       free (dir);
     }
 
-  if (check_for_scripts_dir (SCRIPTDIR))
-    /* We've been installed normally.  */
-    return SCRIPTDIR;
-
   /* Look for "ldscripts" in the dir where our binary is.  */
   dir = make_relative_prefix (program_name, ".", ".");
   if (dir)