diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 17 |
3 files changed, 28 insertions, 12 deletions
@@ -1,3 +1,10 @@ +2017-05-19 Martin Liska <mliska@suse.cz> + + * configure.ac: Add --enable-werror-always just for + bootstrap-debug (or none build config) and do not add it + when we are on a release branch. + * configure: Regenerated. + 2017-05-18 Sheldon Lobo <sheldon.lobo@oracle.com> * MAINTAINERS: Add self to Write After Approval @@ -14587,12 +14587,6 @@ fi # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; -else - if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then - enable_werror=yes -else - enable_werror=no -fi fi case ${enable_werror} in @@ -14600,6 +14594,16 @@ case ${enable_werror} in *) stage2_werror_flag="" ;; esac +if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then + case $BUILD_CONFIG in + bootstrap-debug) + stage2_werror_flag="--enable-werror-always" ;; + "") + stage2_werror_flag="--enable-werror-always" ;; + esac +fi + + # Enable --enable-host-shared. # Check whether --enable-host-shared was given. diff --git a/configure.ac b/configure.ac index 1237749..865dd54 100644 --- a/configure.ac +++ b/configure.ac @@ -3461,16 +3461,21 @@ AC_SUBST(stage1_checking) # Enable -Werror in bootstrap stage2 and later. AC_ARG_ENABLE(werror, [AS_HELP_STRING([--enable-werror], - [enable -Werror in bootstrap stage2 and later])], [], -[if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then - enable_werror=yes -else - enable_werror=no -fi]) + [enable -Werror in bootstrap stage2 and later])], [], []) case ${enable_werror} in yes) stage2_werror_flag="--enable-werror-always" ;; *) stage2_werror_flag="" ;; esac + +if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then + case $BUILD_CONFIG in + bootstrap-debug) + stage2_werror_flag="--enable-werror-always" ;; + "") + stage2_werror_flag="--enable-werror-always" ;; + esac +fi + AC_SUBST(stage2_werror_flag) # Enable --enable-host-shared. |