From 09a9c0954ed89b3779631016a14a3d6d3abee37a Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Wed, 24 Mar 2004 22:08:39 +0000 Subject: [PATCH] configure.ac: Add --enable-werror-always (for top level bootstrap support). (gcc) * configure.ac: Add --enable-werror-always (for top level bootstrap support). * configure: Regenerate. (top level) * configure.in (top level bootstrap support): Rework --enable-werror to set @stage2_werror_flag@. * configure: Regenerate. * Makefile.tpl (top level bootstrap support): Pass @stage2_werror_flag@ down to configure in stages 2 and 3. * Makefile.in: Regenerate. From-SVN: r79935 --- ChangeLog | 9 +++++++++ Makefile.in | 6 ++++-- Makefile.tpl | 6 ++++-- configure | 8 ++++---- configure.in | 8 ++++---- gcc/ChangeLog | 6 ++++++ gcc/configure | 16 +++++++++++++++- gcc/configure.ac | 9 +++++++++ 8 files changed, 55 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fcdcb0b280..2218d7b452d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-03-24 Nathanael Nerode + + * configure.in (top level bootstrap support): Rework --enable-werror + to set @stage2_werror_flag@. + * configure: Regenerate. + * Makefile.tpl (top level bootstrap support): Pass + @stage2_werror_flag@ down to configure in stages 2 and 3. + * Makefile.in: Regenerate. + 2004-03-23 Nathanael Nerode * Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure diff --git a/Makefile.in b/Makefile.in index 888179146b8..2a88b90fad8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24046,6 +24046,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 \ @@ -24089,7 +24091,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 ; \ @@ -24163,7 +24165,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 ; \ diff --git a/Makefile.tpl b/Makefile.tpl index e486dfeda65..4fef85bf335 100644 --- 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 \ @@ -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 ; \ @@ -1491,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 ; \ diff --git a/configure b/configure index a884c3281bf..a674ab6b6fa 100755 --- a/configure +++ b/configure @@ -4484,9 +4484,9 @@ else enable_werror=yes fi -case ${enable_error} in - yes) WERROR=-Werror ;; - *) WERROR= ;; +case ${enable_werror} in + yes) stage2_werror_flag="--enable-werror-always" ;; + *) stage2_werror_flag="" ;; esac @@ -4745,7 +4745,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@stage1_cflags@%$stage1_cflags%g -s%@WERROR@%$WERROR%g +s%@stage2_werror_flag@%$stage2_werror_flag%g CEOF EOF diff --git a/configure.in b/configure.in index 0a9f05fd8fc..5735d84c8b4 100644 --- a/configure.in +++ b/configure.in @@ -2129,10 +2129,10 @@ AC_SUBST(stage1_cflags) AC_ARG_ENABLE(werror, [ --enable-werror enable -Werror in bootstrap stage2 and later], [], [enable_werror=yes]) -case ${enable_error} in - yes) WERROR=-Werror ;; - *) WERROR= ;; +case ${enable_werror} in + yes) stage2_werror_flag="--enable-werror-always" ;; + *) stage2_werror_flag="" ;; esac -AC_SUBST(WERROR) +AC_SUBST(stage2_werror_flag) AC_OUTPUT(Makefile) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 04430b31c03..98b0bbfaed7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-03-24 Nathanael Nerode + + * configure.ac: Add --enable-werror-always (for top level bootstrap + support). + * configure: Regenerate. + 2004-03-24 Ziemowit Laski * objc/objc-act.c (objc_comptypes): Treat comparisons diff --git a/gcc/configure b/gcc/configure index 54fac9706c9..db55887e227 100755 --- a/gcc/configure +++ b/gcc/configure @@ -854,6 +854,7 @@ Optional Features: put copies of generated files in source dir intended for creating source tarballs for users without texinfo bison or flex. + --enable-werror-always enable -Werror always --enable-werror enable -Werror in bootstrap stage2 and later --enable-checking=LIST enable expensive run-time checks. With LIST, @@ -3894,6 +3895,19 @@ if test $ac_cv_prog_cc_w_old_style_definition = yes ; then strict1_warn="${strict1_warn} -Wold-style-definition" fi +# Enable -Werror, period. +# Check whether --enable-werror_always or --disable-werror_always was given. +if test "${enable_werror_always+set}" = set; then + enableval="$enable_werror_always" + +else + enable_werror_always=no +fi; +if test x${enable_werror_always} = xyes ; then + strict1_warn="${strict1_warn} -Werror" + WERROR=-Werror +fi + # If the native compiler is GCC, we can enable warnings even in stage1. # That's useful for people building cross-compilers, or just running a # quick `make'. @@ -5247,7 +5261,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:5250: version of makeinfo is $ac_prog_version" >&5 + echo "configure:5264: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) diff --git a/gcc/configure.ac b/gcc/configure.ac index 7a4f7905662..a4da3d26541 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -346,6 +346,15 @@ if test $ac_cv_prog_cc_w_old_style_definition = yes ; then strict1_warn="${strict1_warn} -Wold-style-definition" fi +# Enable -Werror, period. +AC_ARG_ENABLE(werror_always, +[ --enable-werror-always enable -Werror always], [], +[enable_werror_always=no]) +if test x${enable_werror_always} = xyes ; then + strict1_warn="${strict1_warn} -Werror" + WERROR=-Werror +fi + # If the native compiler is GCC, we can enable warnings even in stage1. # That's useful for people building cross-compilers, or just running a # quick `make'.