aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-03-10 13:55:44 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-03-11 08:49:20 +0100
commit77b62fe6e1406cea4167cf91c5567d67f79f0102 (patch)
treef03d1a5a004325842c85a2ea3be4b58a19419a91
parentf0f3952f551073450cb950d693b692d4eabe4e76 (diff)
configure: fix -pedantic-errors for GCC 5 and later
If --enable-werror is used. Follow-up to d5c0351055d5709da which added it too early in the configure script before $compiler_num was set correctly and thus this option was never used. Reported-by: Stepan Efremov Fixes #5067 Closes #5068
-rwxr-xr-xconfigure.ac26
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index e7ad63925..4f4aeb91b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -59,19 +59,6 @@ XC_CHECK_PATH_SEPARATOR
CONFIGURE_OPTIONS="\"$ac_configure_args\""
AC_SUBST(CONFIGURE_OPTIONS)
-CURL_CFLAG_EXTRAS=""
-if test X"$want_werror" = Xyes; then
- CURL_CFLAG_EXTRAS="-Werror"
- if test "$compiler_id" = "GNU_C"; then
- dnl enable -pedantic-errors for GCC 5 and later,
- dnl as before that it was the same as -Werror=pedantic
- if test "$compiler_num" -ge "500"; then
- CURL_CFLAG_EXTRAS="$CURL_CFLAG_EXTRAS -pedantic-errors"
- fi
- fi
-fi
-AC_SUBST(CURL_CFLAG_EXTRAS)
-
dnl SED is mandatory for configure process and libtool.
dnl Set it now, allowing it to be changed later.
if test -z "$SED"; then
@@ -286,6 +273,19 @@ if test "$compiler_id" = "INTEL_UNIX_C"; then
#
fi
+CURL_CFLAG_EXTRAS=""
+if test X"$want_werror" = Xyes; then
+ CURL_CFLAG_EXTRAS="-Werror"
+ if test "$compiler_id" = "GNU_C"; then
+ dnl enable -pedantic-errors for GCC 5 and later,
+ dnl as before that it was the same as -Werror=pedantic
+ if test "$compiler_num" -ge "500"; then
+ CURL_CFLAG_EXTRAS="$CURL_CFLAG_EXTRAS -pedantic-errors"
+ fi
+ fi
+fi
+AC_SUBST(CURL_CFLAG_EXTRAS)
+
CURL_CHECK_COMPILER_HALT_ON_ERROR
CURL_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE
CURL_CHECK_COMPILER_PROTOTYPE_MISMATCH