From cecd09ceb9f29cac39a2adb53220f3ed90e43cbb Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 15 May 2020 19:22:55 +0200
Subject: [PATCH] configure: Check if --disable-stdcall-fixup is supported
 before using it.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 configure    | 26 +++++++++++++++++++++++++-
 configure.ac |  3 ++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f85e18b77f7..7e4a153c207 100755
--- a/configure
+++ b/configure
@@ -8237,7 +8237,31 @@ fi
     LIBEXT="dll"
     DLLEXT=""
         case $host_cpu in
-      *i[3456]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;;
+      *i[3456]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5
+$as_echo_n "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; }
+if ${ac_cv_cflags__Wl___disable_stdcall_fixup+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wl,--disable-stdcall-fixup"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(int argc, char **argv) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_cflags__Wl___disable_stdcall_fixup=yes
+else
+  ac_cv_cflags__Wl___disable_stdcall_fixup=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___disable_stdcall_fixup" >&5
+$as_echo "$ac_cv_cflags__Wl___disable_stdcall_fixup" >&6; }
+if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then :
+  LDDLLFLAGS="-Wl,--disable-stdcall-fixup"
+fi ;;
     esac
         enable_iphlpapi=${enable_iphlpapi:-no}
     enable_kernel32=${enable_kernel32:-no}
diff --git a/configure.ac b/configure.ac
index 0dbcb3d095c..b7916fcca7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,7 +727,8 @@ case $host_os in
     DLLEXT=""
     dnl Disable stdcall fixups to catch prototype mismatches
     case $host_cpu in
-      *i[[3456]]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;;
+      *i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup],
+                                     [LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;;
     esac
     dnl Disable modules that can't be used on Windows
     enable_iphlpapi=${enable_iphlpapi:-no}