From afd88efc0530ec39d926c9932e4302cff9a2e526 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 31 May 2017 15:35:41 +0200 Subject: [PATCH] Fix configure.ac to respect --{enable,disable}-werror option. 2017-05-31 Martin Liska * configure.ac: Add handling of stage2_werror_flags to action-if-given and to action-if-not-given. * configure: Regenerate. From-SVN: r248737 --- ChangeLog | 6 ++++++ configure | 7 +++++-- configure.ac | 7 +++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3226c7c397..775d72e7eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-05-31 Martin Liska + + * 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 * MAINTAINERS: Add self to Write After Approval diff --git a/configure b/configure index 82aa619fad1..2cbb4b7ab9d 100755 --- 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 78d2d593106..82faf06946d 100644 --- 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) -- 2.30.2