From b3c4940471e8f05d61af88bf21499dfa8b9c695a Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 2 Aug 2005 21:15:12 +0000
Subject: [PATCH] Clean up search directories to what we really use.

---
 gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch | 69 +++++++++++++++-----
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch b/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch
index 73d06d7e02..615cd1fee9 100644
--- a/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch
+++ b/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch
@@ -1,12 +1,13 @@
-$DragonFly: src/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch,v 1.2 2004/12/21 13:10:48 joerg Exp $
+$DragonFly: src/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch,v 1.3 2005/08/02 21:15:12 joerg Exp $
 
+Index: gcc.c
 ===================================================================
 RCS file: /home/joerg/wd/repository/dragonflybsd/src/contrib/gcc-3.4/gcc/gcc.c,v
-retrieving revision 1.2
-diff -u -r1.2 gcc.c
---- gcc.c	20 Dec 2004 19:23:24 -0000	1.2
-+++ gcc.c	20 Dec 2004 20:48:10 -0000
-@@ -1408,8 +1408,7 @@
+retrieving revision 1.3
+diff -u -r1.3 gcc.c
+--- gcc.c	24 May 2005 06:29:31 -0000	1.3
++++ gcc.c	2 Aug 2005 19:22:59 -0000
+@@ -1409,8 +1409,7 @@
  static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
  static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
  static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
@@ -16,7 +17,7 @@ diff -u -r1.2 gcc.c
  
  static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
  static const char *tooldir_prefix;
-@@ -3214,8 +3213,6 @@
+@@ -3219,8 +3218,6 @@
        set_std_prefix (gcc_exec_prefix, len);
        add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC",
  		  PREFIX_PRIORITY_LAST, 0, NULL, 0);
@@ -25,7 +26,7 @@ diff -u -r1.2 gcc.c
      }
  
    /* COMPILER_PATH and LIBRARY_PATH have values
-@@ -3763,11 +3760,6 @@
+@@ -3768,11 +3765,6 @@
  	      PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
  #endif
  
@@ -37,7 +38,7 @@ diff -u -r1.2 gcc.c
    tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
  			   dir_separator_str, NULL);
  
-@@ -3790,10 +3782,6 @@
+@@ -3795,10 +3787,6 @@
  		      concat (gcc_exec_tooldir_prefix, "bin",
  			      dir_separator_str, NULL),
  		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 0);
@@ -48,17 +49,46 @@ diff -u -r1.2 gcc.c
  	}
  
        tooldir_prefix = concat (standard_exec_prefix, spec_machine,
-@@ -3804,9 +3792,6 @@
-   add_prefix (&exec_prefixes,
- 	      concat (tooldir_prefix, "bin", dir_separator_str, NULL),
- 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 0);
+@@ -3806,13 +3794,6 @@
+ 			       dir_separator_str, tooldir_prefix, NULL);
+     }
+ 
+-  add_prefix (&exec_prefixes,
+-	      concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+-	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 0);
 -  add_prefix (&startfile_prefixes,
 -	      concat (tooldir_prefix, "lib", dir_separator_str, NULL),
 -	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
- 
+-
  #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
    /* If the normal TARGET_SYSTEM_ROOT is inside of $exec_prefix,
-@@ -6124,35 +6109,10 @@
+      then consider it to relocate with the rest of the GCC installation
+@@ -6037,11 +6018,6 @@
+   n_compilers = n_default_compilers;
+ 
+   /* Read specs from a file if there is one.  */
+-
+-  machine_suffix = concat (spec_machine, dir_separator_str,
+-			   spec_version, dir_separator_str, NULL);
+-  just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
+-
+   specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, 0);
+   /* Read the specs file unless it is a default one.  */
+   if (specs_file != 0 && strcmp (specs_file, "specs"))
+@@ -6051,11 +6027,9 @@
+ 
+   /* We need to check standard_exec_prefix/just_machine_suffix/specs
+      for any override of as, ld and libraries.  */
+-  specs_file = alloca (strlen (standard_exec_prefix)
+-		       + strlen (just_machine_suffix) + sizeof ("specs"));
++  specs_file = alloca (strlen (standard_exec_prefix) + sizeof ("specs"));
+ 
+   strcpy (specs_file, standard_exec_prefix);
+-  strcat (specs_file, just_machine_suffix);
+   strcat (specs_file, "specs");
+   if (access (specs_file, R_OK) == 0)
+     read_specs (specs_file, TRUE);
+@@ -6129,35 +6103,10 @@
  	add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix_1,
  			      "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  
@@ -98,3 +128,12 @@ diff -u -r1.2 gcc.c
  #if 0 /* Can cause surprises, and one can use -B./ instead.  */
        add_prefix (&startfile_prefixes, "./", NULL,
  		  PREFIX_PRIORITY_LAST, 1, NULL, 0);
+@@ -6197,7 +6146,7 @@
+ 
+   if (print_search_dirs)
+     {
+-      printf (_("install: %s%s\n"), standard_exec_prefix, machine_suffix);
++      printf (_("install: %s\n"), standard_exec_prefix);
+       printf (_("programs: %s\n"), build_search_list (&exec_prefixes, "", 0));
+       printf (_("libraries: %s\n"), build_search_list (&startfile_prefixes, "", 0));
+       return (0);
-- 
2.41.0