Alexandre Julliard : configure: Force -static-libgcc when using libunwind.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 167f188d71c75d88e3b74600b3bda4688e70f984
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=167f188d71c75d88e3b74600b...

Author: Alexandre Julliard 
Date:   Thu Dec 10 10:34:17 2020 +0100

configure: Force -static-libgcc when using libunwind.

libunwind defines the same symbols as libgcc_s but may not be
compatible.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49312
Signed-off-by: Alexandre Julliard

---

configure    | 1 +
 configure.ac | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/configure b/configure
index c04b4106a86..c6d2bab49f5 100755
--- a/configure
+++ b/configure
@@ -14892,6 +14892,7 @@ $as_echo "$wine_cv_have_unw_step" >&6; }
         if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS"
         then
             save_libs=$LIBS
+                        UNWIND_LIBS="-static-libgcc $UNWIND_LIBS"
             LIBS="$UNWIND_LIBS $LIBS"
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5
 $as_echo_n "checking for unw_step in libunwind... " >&6; }
diff --git a/configure.ac b/configure.ac
index 020fd19256f..85ba522a951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1685,6 +1685,8 @@ then
         if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS"
         then
             save_libs=$LIBS
+            dnl Force static libgcc, libunwind breaks libgcc_s unwinding
+            UNWIND_LIBS="-static-libgcc $UNWIND_LIBS"
             LIBS="$UNWIND_LIBS $LIBS"
             AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step,
                [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY