aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure5
-rw-r--r--configure.in7
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f5cf47..94fd2b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-04 Paolo Bonzini <bonzini@gnu.org>
+
+ * configure.in: Use DEV-PHASE to detect the default for --enable-werror.
+ * configure: Regenerate.
+
2007-01-03 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def (target_modules): Add libgcc.
diff --git a/configure b/configure
index 2e3af68..9a970a4 100755
--- a/configure
+++ b/configure
@@ -7439,13 +7439,16 @@ fi
# Enable -Werror in bootstrap stage2 and later.
-# Change the default to "no" on release branches.
# Check whether --enable-werror or --disable-werror was given.
if test "${enable_werror+set}" = set; then
enableval="$enable_werror"
:
else
+ if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
enable_werror=yes
+else
+ enable_werror=no
+fi
fi
case ${enable_werror} in
diff --git a/configure.in b/configure.in
index 6c7189f..a808467 100644
--- a/configure.in
+++ b/configure.in
@@ -2488,10 +2488,13 @@ fi])
AC_SUBST(stage1_checking)
# Enable -Werror in bootstrap stage2 and later.
-# Change the default to "no" on release branches.
AC_ARG_ENABLE(werror,
[ --enable-werror enable -Werror in bootstrap stage2 and later], [],
-[enable_werror=yes])
+[if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
+ enable_werror=yes
+else
+ enable_werror=no
+fi])
case ${enable_werror} in
yes) stage2_werror_flag="--enable-werror-always" ;;
*) stage2_werror_flag="" ;;