* configure.in (top level bootstrap support): Rework --enable-werror

[deliverable/binutils-gdb.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index 91fdae2d285c1e3a995bb8d4cf5363e849514be3..4fef85bf335c17f5da83a0d185fbd90e45b2f983 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1374,6 +1374,8 @@ all-stage1-gcc: configure-stage1-gcc prebootstrap
        $(STAMP) all-stage1-gcc
 
 # TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally)
+# Possibly pass --enable-werror-always (depending on --enable-werror);
+# that's what @stage2_werror_flag@ is for
 configure-stage2-gcc: all-stage1-gcc
        echo configure-stage2-gcc > stage_last ; \
        if [ -f stage2-gcc/Makefile ] ; then \
@@ -1389,13 +1391,11 @@ configure-stage2-gcc: all-stage1-gcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -1403,6 +1403,8 @@ configure-stage2-gcc: all-stage1-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
+       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
        echo Configuring stage 2 in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -1417,7 +1419,7 @@ configure-stage2-gcc: all-stage1-gcc
            libsrcdir="$$s/gcc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} ; \
+         $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
        cd .. ; \
        mv gcc stage2-gcc ; \
        mv prev-gcc stage1-gcc ; \
@@ -1429,8 +1431,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        CFLAGS="$(BOOT_CFLAGS)" \
        ADAC="\$$(CC)" \
        WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
-       STRICT_WARN="\$$(STRICT2_WARN)" \
-       OUTPUT_OPTION="-o \$$@"
+       STRICT_WARN="\$$(STRICT2_WARN)"
 
 all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
        echo all-stage2-gcc > stage_last ; \
@@ -1459,18 +1460,16 @@ configure-stage3-gcc: all-stage2-gcc
        fi ; \
        [ -d stage3-gcc ] || mkdir stage3-gcc; \
        mv stage3-gcc gcc ; \
-       mv stage1-gcc prev-gcc ; \
+       mv stage2-gcc prev-gcc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -1478,6 +1477,8 @@ configure-stage3-gcc: all-stage2-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
+       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
        echo Configuring stage 3 in gcc; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -1492,7 +1493,7 @@ configure-stage3-gcc: all-stage2-gcc
            libsrcdir="$$s/gcc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} ; \
+         $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
        cd .. ; \
        mv gcc stage3-gcc ; \
        mv prev-gcc stage2-gcc ; \