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

diff --git a/ChangeLog b/ChangeLog
index e3226c7c39777b15bd7fdcc2bf2f6e86ed8b77c4..775d72e7eb158c728e875eeeeb88f3ad87a99d22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure b/configure
index 82aa619fad145f8565fed3f01e5cff397ebc8535..2cbb4b7ab9ddd0c30c5fecf0ba3d845ce8d11ec7 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.

diff --git a/configure.ac b/configure.ac
index 78d2d5931067b1f0b429e5bdbe3af8d513c97e57..82faf06946d5f459df4e8c0904527e0b825cce5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)