(process_command): When GCC_EXEC_PREFIX is defined and tooldir is relative...

(process_command): When GCC_EXEC_PREFIX is defined and
tooldir is relative, add it to search path in addition to standard
directory rather than instead of.

From-SVN: r4588

1 files changed, 29 insertions, 18 deletions

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 0913c88..502f13e 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2352,24 +2352,6 @@ process_command (argc, argv)
 	n_infiles++;
     }
 
-  tooldir_prefix = concat (tooldir_base_prefix, spec_machine, "/");
-
-  /* If tooldir is relative, base it on exec_prefix.  A relative
-     tooldir lets us move the installed tree as a unit.  */
-
-  if (*tooldir_prefix != '/')
-    {
-      if (gcc_exec_prefix)
-	tooldir_prefix = concat (concat (gcc_exec_prefix, spec_machine, "/"),
-				 concat (spec_version, "/", tooldir_prefix),
-				 "");
-      else
-	tooldir_prefix = concat (concat (standard_exec_prefix, spec_machine, "/"),
-				 concat (spec_version, "/", tooldir_prefix),
-				 "");
-    }
-
-
   /* Set up the search paths before we go looking for config files.  */
 
   /* These come before the md prefixes so that we will find gcc's subcommands
@@ -2382,6 +2364,35 @@ process_command (argc, argv)
   add_prefix (&startfile_prefix, standard_exec_prefix, 0, 1, NULL_PTR);
   add_prefix (&startfile_prefix, standard_exec_prefix_1, 0, 1, NULL_PTR);
 
+  tooldir_prefix = concat (tooldir_base_prefix, spec_machine, "/");
+
+  /* If tooldir is relative, base it on exec_prefix.  A relative
+     tooldir lets us move the installed tree as a unit.
+
+     If GCC_EXEC_PREFIX is defined, then we want to add two relative
+     directories, so that we can search both the user specified directory
+     and the standard place.  */
+
+  if (*tooldir_prefix != '/')
+    {
+      if (gcc_exec_prefix)
+	{
+	  char *gcc_exec_tooldir_prefix
+	    = concat (concat (gcc_exec_prefix, spec_machine, "/"),
+		      concat (spec_version, "/", tooldir_prefix),
+		      "");
+
+	  add_prefix (&exec_prefix, concat (gcc_exec_tooldir_prefix, "bin", "/"),
+		      0, 0, NULL_PTR);
+	  add_prefix (&startfile_prefix, concat (gcc_exec_tooldir_prefix, "lib", "/"),
+		      0, 0, NULL_PTR);
+	}
+
+      tooldir_prefix = concat (concat (standard_exec_prefix, spec_machine, "/"),
+			       concat (spec_version, "/", tooldir_prefix),
+			       "");
+    }
+
   add_prefix (&exec_prefix, concat (tooldir_prefix, "bin", "/"),
 	      0, 0, NULL_PTR);
   add_prefix (&startfile_prefix, concat (tooldir_prefix, "lib", "/"),