Fix configure.ac to respect --{enable,disable}-werror option.

2017-05-31  Martin Liska  <mliska@suse.cz>

	* configure.ac: Add handling of stage2_werror_flags to
	action-if-given and to action-if-not-given.
	* configure: Regenerate.

From-SVN: r248737
This commit is contained in:
Martin Liska 2017-05-31 15:35:41 +02:00 committed by Martin Liska
parent a02d1ad2b2
commit afd88efc05
3 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2017-05-31 Martin Liska <mliska@suse.cz>
* configure.ac: Add handling of stage2_werror_flags to
action-if-given and to action-if-not-given.
* configure: Regenerate.
2017-05-31 Prakhar Bahuguna <prakhar.bahuguna@arm.com>
* MAINTAINERS: Add self to Write After Approval

7
configure vendored
View File

@ -14641,13 +14641,13 @@ fi
# Check whether --enable-werror was given.
if test "${enable_werror+set}" = set; then :
enableval=$enable_werror;
fi
case ${enable_werror} in
yes) stage2_werror_flag="--enable-werror-always" ;;
*) stage2_werror_flag="" ;;
esac
else
if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
case $BUILD_CONFIG in
bootstrap-debug)
@ -14657,6 +14657,9 @@ if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental;
esac
fi
fi
# Specify what files to not compare during bootstrap.

View File

@ -3508,12 +3508,14 @@ 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])], [], [])
[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)
@ -3522,6 +3524,7 @@ if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental;
stage2_werror_flag="--enable-werror-always" ;;
esac
fi
])
AC_SUBST(stage2_werror_flag)