Re: [configure PATCH] Do not rerun fixincludes during toplevel bootstrap

[Nathanael Nerode <neroden at twcny dot rr dot com>]

Paolo Bonzini wrote:
> The various stages should obviously have the same includes.  This 
> removes an additional harness that toplevel bootstrap had when compared 
> to gcc bootstrap (building fixincludes with the new GCC in stages 2 and 
> 3), but saves something in bootstrap time.
Fixincludes is built after GCC (oddly enough), because it depends on 
specs in order to decide which predefined not-in-the-right-namespace 
symbols to fix in system headers.

Specs shouldn't vary from stage to stage, but they might, I suppose.  :-/

I dunno, maybe leaving the harness in is better.  :-/

> (BTW, I've counted the number of Makefile.in lines that can go away with 
> toplevel bootstrap, it's around 700).
>
> New-bootstrapped i686-pc-linux-gnu, ok for mainline?
>
> Paolo
>
> 2004-08-20  Paolo Bonzini  <bonzini@gnu.org>
>
>     * configure.ac (STMP_FIXINC): Do not set it for stages after
>     stage1 during bootstrap, and copy the include directory from
>     prev-gcc.
>     * configure: Regenerate.
>
>
> ------------------------------------------------------------------------
>
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
> retrieving revision 2.54
> diff -u -r2.54 configure.ac
> --- configure.ac	17 Aug 2004 07:26:46 -0000	2.54
> +++ configure.ac	20 Aug 2004 09:58:37 -0000
> @@ -1668,6 +1668,13 @@
>      fi
>  fi
>  
> +# When bootstrapping from the toplevel, only run fixincludes during stage1
> +if test -d ../prev-gcc && test "$LN_S" = 'ln -s'
> +then
> +    STMP_FIXINC=
> +    cp -R ../prev-gcc/include include
> +fi
> +
>  # Expand extra_headers to include complete path.
>  # This substitutes for lots of t-* files.
>  extra_headers_list=

I wish there were a cleaner way to do this, but I think that will have 
to wait until fixincludes is moved to its own top level directory.