Martin Storsjo : configure: Use -Werror= unknown-warning-option in later cross tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9ee154066ab571c81d4a2a7a7739c3e9841a02ca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9ee154066ab571c81d4a2a7a7...

Author: Martin Storsjo <martin(a)martin.st>
Date:   Wed Apr 10 15:49:17 2019 +0300

configure: Use -Werror=unknown-warning-option in later cross tests.

Previously, if detected, the option was added to EXTRACROSSFLAGS,
which isn't taken into use in later WINE_TRY_CROSSCFLAGS tests.

Signed-off-by: Martin Storsjo <martin(a)martin.st>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index dd000b2..a966217 100755
--- a/configure
+++ b/configure
@@ -9768,7 +9768,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Werror_unknown_warning_option" >&5
 $as_echo "$ac_cv_crosscflags__Werror_unknown_warning_option" >&6; }
 if test "x$ac_cv_crosscflags__Werror_unknown_warning_option" = xyes; then :
-  EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Werror=unknown-warning-option"
+  CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 fi
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wdeclaration-after-statement" >&5
 $as_echo_n "checking whether the cross-compiler supports -Wdeclaration-after-statement... " >&6; }
diff --git a/configure.ac b/configure.ac
index ad4f0e0..d8ab782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1024,7 +1024,7 @@ then
                           [AC_MSG_RESULT([no])])
         WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
         dnl clang needs to be told to fail on unknown options
-        WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option])
+        WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])
         WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement])
         WINE_TRY_CROSSCFLAGS([-Wempty-body])
         WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers])