From: Martin Liska <mliska@suse.cz>
Date: Fri, 19 May 2017 13:31:01 +0000 (+0200)
Subject: Enable by default -Werror just for bootstrap-debug.mk and default build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01c712cb903689bd41733f098e8efbbe116511b0;p=gcc.git

Enable by default -Werror just for bootstrap-debug.mk and default build.

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.

From-SVN: r248276
---

diff --git a/ChangeLog b/ChangeLog
index d9858d99ebf..b75693b1ed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure b/configure
index 32a38633ad8..2c2fe644cfa 100755
--- a/configure
+++ b/configure
@@ -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 12377499295..865dd543fa3 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.