Module: wine Branch: master Commit: 267e61fd188b33bf83d89b09a2ed0f63916a527e URL: https://source.winehq.org/git/wine.git/?a=commit;h=267e61fd188b33bf83d89b09a...
Author: Jacek Caban jacek@codeweavers.com Date: Thu May 21 01:46:18 2020 +0200
configure: Remove no longer needed -Wno-incompatible-library-redeclaration.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 31 ------------------------------- configure.ac | 2 -- 2 files changed, 33 deletions(-)
diff --git a/configure b/configure index f695e0fb00..ccda743c99 100755 --- a/configure +++ b/configure @@ -10417,37 +10417,6 @@ $as_echo "$ac_cv_crosscflags__Wlogical_op" >&6; } if test "x$ac_cv_crosscflags__Wlogical_op" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wlogical-op" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wincompatible-library-redeclaration" >&5 -$as_echo_n "checking whether the cross-compiler supports -Wincompatible-library-redeclaration... " >&6; } -if ${ac_cv_crosscflags__Wincompatible_library_redeclaration+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_cc=$CC -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wincompatible-library-redeclaration" -CC="$CROSSCC" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_crosscflags__Wincompatible_library_redeclaration=yes -else - ac_cv_crosscflags__Wincompatible_library_redeclaration=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -CC=$ac_wine_try_cflags_saved_cc -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wincompatible_library_redeclaration" >&5 -$as_echo "$ac_cv_crosscflags__Wincompatible_library_redeclaration" >&6; } -if test "x$ac_cv_crosscflags__Wincompatible_library_redeclaration" = xyes; then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration" -fi
case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 4c3f1b9de5..d81f5cc88c 100644 --- a/configure.ac +++ b/configure.ac @@ -1092,8 +1092,6 @@ then WINE_TRY_CROSSCFLAGS([-Wwrite-strings]) WINE_TRY_CROSSCFLAGS([-Wpointer-arith]) WINE_TRY_CROSSCFLAGS([-Wlogical-op]) - WINE_TRY_CROSSCFLAGS([-Wincompatible-library-redeclaration], - [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration"])
case $host_cpu in *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;;