* ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as

well.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fbb39f11cc3fdff7b3ca3add11d762f203c4bf84..aa8070e18373e978a3830c36e7abbe8d2bc26d1f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-03  Alexandre Oliva  <aoliva@redhat.com>
 
+       * ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as
+       well.
+
        * ldfile.h (struct search_dirs): Added sysrooted field.
        * ldlang.h (struct lang_input_statement_struct): Likewise.
        * ldfile.c (ldfile_add_library_path): Mark sysrooted paths.

diff --git a/ld/ldmain.c b/ld/ldmain.c
index e9f26e2cf7ff589ccecba143a4c9e21096d237b8..214847d9a0571fe90c2f81bf875660dea3a931c9 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -669,6 +669,14 @@ set_scripts_dir ()
   if (dir)
     free (dir);
 
+  dir = make_relative_prefix (program_name, TOOLBINDIR, SCRIPTDIR);
+  if (dir && check_for_scripts_dir (dir))
+    /* Success.  Don't free dir.  */
+    return;
+
+  if (dir)
+    free (dir);
+
   if (check_for_scripts_dir (SCRIPTDIR))
     /* We've been installed normally.  */
     return;