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
This commit is contained in:
Nathanael Nerode 2004-03-24 22:08:39 +00:00
parent 58c959212f
commit 09a9c0954e
8 changed files with 55 additions and 13 deletions

View File

@ -1,3 +1,12 @@
2004-03-24 Nathanael Nerode <neroden@gcc.gnu.org>
* 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 <neroden@gcc.gnu.org> 2004-03-23 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure * Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure

View File

@ -24046,6 +24046,8 @@ all-stage1-gcc: configure-stage1-gcc prebootstrap
$(STAMP) all-stage1-gcc $(STAMP) all-stage1-gcc
# TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally) # 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 configure-stage2-gcc: all-stage1-gcc
echo configure-stage2-gcc > stage_last ; \ echo configure-stage2-gcc > stage_last ; \
if [ -f stage2-gcc/Makefile ] ; then \ if [ -f stage2-gcc/Makefile ] ; then \
@ -24089,7 +24091,7 @@ configure-stage2-gcc: all-stage1-gcc
libsrcdir="$$s/gcc";; \ libsrcdir="$$s/gcc";; \
esac; \ esac; \
$(SHELL) $${libsrcdir}/configure \ $(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
cd .. ; \ cd .. ; \
mv gcc stage2-gcc ; \ mv gcc stage2-gcc ; \
mv prev-gcc stage1-gcc ; \ mv prev-gcc stage1-gcc ; \
@ -24163,7 +24165,7 @@ configure-stage3-gcc: all-stage2-gcc
libsrcdir="$$s/gcc";; \ libsrcdir="$$s/gcc";; \
esac; \ esac; \
$(SHELL) $${libsrcdir}/configure \ $(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
cd .. ; \ cd .. ; \
mv gcc stage3-gcc ; \ mv gcc stage3-gcc ; \
mv prev-gcc stage2-gcc ; \ mv prev-gcc stage2-gcc ; \

View File

@ -1374,6 +1374,8 @@ all-stage1-gcc: configure-stage1-gcc prebootstrap
$(STAMP) all-stage1-gcc $(STAMP) all-stage1-gcc
# TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally) # 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 configure-stage2-gcc: all-stage1-gcc
echo configure-stage2-gcc > stage_last ; \ echo configure-stage2-gcc > stage_last ; \
if [ -f stage2-gcc/Makefile ] ; then \ if [ -f stage2-gcc/Makefile ] ; then \
@ -1417,7 +1419,7 @@ configure-stage2-gcc: all-stage1-gcc
libsrcdir="$$s/gcc";; \ libsrcdir="$$s/gcc";; \
esac; \ esac; \
$(SHELL) $${libsrcdir}/configure \ $(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
cd .. ; \ cd .. ; \
mv gcc stage2-gcc ; \ mv gcc stage2-gcc ; \
mv prev-gcc stage1-gcc ; \ mv prev-gcc stage1-gcc ; \
@ -1491,7 +1493,7 @@ configure-stage3-gcc: all-stage2-gcc
libsrcdir="$$s/gcc";; \ libsrcdir="$$s/gcc";; \
esac; \ esac; \
$(SHELL) $${libsrcdir}/configure \ $(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
cd .. ; \ cd .. ; \
mv gcc stage3-gcc ; \ mv gcc stage3-gcc ; \
mv prev-gcc stage2-gcc ; \ mv prev-gcc stage2-gcc ; \

8
configure vendored
View File

@ -4484,9 +4484,9 @@ else
enable_werror=yes enable_werror=yes
fi fi
case ${enable_error} in case ${enable_werror} in
yes) WERROR=-Werror ;; yes) stage2_werror_flag="--enable-werror-always" ;;
*) WERROR= ;; *) stage2_werror_flag="" ;;
esac esac
@ -4745,7 +4745,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g s%@MAINT@%$MAINT%g
s%@stage1_cflags@%$stage1_cflags%g s%@stage1_cflags@%$stage1_cflags%g
s%@WERROR@%$WERROR%g s%@stage2_werror_flag@%$stage2_werror_flag%g
CEOF CEOF
EOF EOF

View File

@ -2129,10 +2129,10 @@ AC_SUBST(stage1_cflags)
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
[ --enable-werror enable -Werror in bootstrap stage2 and later], [], [ --enable-werror enable -Werror in bootstrap stage2 and later], [],
[enable_werror=yes]) [enable_werror=yes])
case ${enable_error} in case ${enable_werror} in
yes) WERROR=-Werror ;; yes) stage2_werror_flag="--enable-werror-always" ;;
*) WERROR= ;; *) stage2_werror_flag="" ;;
esac esac
AC_SUBST(WERROR) AC_SUBST(stage2_werror_flag)
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)

View File

@ -1,3 +1,9 @@
2004-03-24 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.ac: Add --enable-werror-always (for top level bootstrap
support).
* configure: Regenerate.
2004-03-24 Ziemowit Laski <zlaski@apple.com> 2004-03-24 Ziemowit Laski <zlaski@apple.com>
* objc/objc-act.c (objc_comptypes): Treat comparisons * objc/objc-act.c (objc_comptypes): Treat comparisons

16
gcc/configure vendored
View File

@ -854,6 +854,7 @@ Optional Features:
put copies of generated files in source dir put copies of generated files in source dir
intended for creating source tarballs for users intended for creating source tarballs for users
without texinfo bison or flex. without texinfo bison or flex.
--enable-werror-always enable -Werror always
--enable-werror enable -Werror in bootstrap stage2 and later --enable-werror enable -Werror in bootstrap stage2 and later
--enable-checking=LIST --enable-checking=LIST
enable expensive run-time checks. With 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" strict1_warn="${strict1_warn} -Wold-style-definition"
fi 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. # 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 # That's useful for people building cross-compilers, or just running a
# quick `make'. # quick `make'.
@ -5247,7 +5261,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
else else
ac_prog_version=`$MAKEINFO --version 2>&1 | ac_prog_version=`$MAKEINFO --version 2>&1 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` 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 case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;; '') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*) 4.[2-9]*)

View File

@ -346,6 +346,15 @@ if test $ac_cv_prog_cc_w_old_style_definition = yes ; then
strict1_warn="${strict1_warn} -Wold-style-definition" strict1_warn="${strict1_warn} -Wold-style-definition"
fi 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. # 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 # That's useful for people building cross-compilers, or just running a
# quick `make'. # quick `make'.