Commit 167f188d authored by Alexandre Julliard's avatar Alexandre Julliard

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=49312Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 35c880ef
...@@ -14892,6 +14892,7 @@ $as_echo "$wine_cv_have_unw_step" >&6; } ...@@ -14892,6 +14892,7 @@ $as_echo "$wine_cv_have_unw_step" >&6; }
if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS"
then then
save_libs=$LIBS save_libs=$LIBS
UNWIND_LIBS="-static-libgcc $UNWIND_LIBS"
LIBS="$UNWIND_LIBS $LIBS" LIBS="$UNWIND_LIBS $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5
$as_echo_n "checking for unw_step in libunwind... " >&6; } $as_echo_n "checking for unw_step in libunwind... " >&6; }
......
...@@ -1685,6 +1685,8 @@ then ...@@ -1685,6 +1685,8 @@ then
if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS"
then then
save_libs=$LIBS save_libs=$LIBS
dnl Force static libgcc, libunwind breaks libgcc_s unwinding
UNWIND_LIBS="-static-libgcc $UNWIND_LIBS"
LIBS="$UNWIND_LIBS $LIBS" LIBS="$UNWIND_LIBS $LIBS"
AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment