Module: wine Branch: master Commit: ee9beb58639269074a4761fa67eaba95fb6fe149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9beb58639269074a4761fa6...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Dec 10 20:19:33 2019 +0100
configure: Silence -Wincompatible-library-redeclaration warning.
This is noisy on clang and we can't change declarations due to long double type incompatibility.
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 insertions(+)
diff --git a/configure b/configure index a5c504b70b..3af68ca71c 100755 --- a/configure +++ b/configure @@ -10295,6 +10295,37 @@ $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 -Wincompatible-library-redeclaration" +CC="$CROSSCC" +ac_exeext=".exe" +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_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 13f971866b..a3bece9e8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,6 +1074,8 @@ 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]) ;;