From 318a091dd4a122735ef5df09875d59d07d64874f Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Thu, 22 Dec 2022 11:22:05 -0500
Subject: [PATCH] remove cross_compiling check
---
configure | 6 +++---
configure.ac | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 9c937f61..2d25a600 100755
--- a/configure
+++ b/configure
@@ -6227,7 +6227,7 @@ esac
case $host in
x86_64*|amd64*)
- if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" != "xyes" -a "$cross_compiling" != "yes"
+ if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" != "xyes"
then
CC="$CC -m32"
CXX="$CXX -m32"
@@ -6269,7 +6269,7 @@ printf "%s\n" "$wine_cv_cc_m32" >&6; }
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
with_unwind=${with_unwind:-no}
- elif test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes" -a "$cross_compiling" != "yes"
+ elif test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes"
then
if test "x${GCC}" = "xyes"
then
@@ -19657,7 +19657,7 @@ then :
fi
fi
- if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes" -a "$cross_compiling" != "yes"
+ if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes"
then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=extra-tokens" >&5
printf %s "checking whether the compiler supports -Werror=extra-tokens... " >&6; }
diff --git a/configure.ac b/configure.ac
index 480f673e..ee890f6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ AC_SUBST(HOSTSTACK_CFLAGS)
AC_SUBST(TARGETFLAGS)
case $host in
x86_64*|amd64*)
- if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" != "xyes" -a "$cross_compiling" != "yes"
+ if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" != "xyes"
then
CC="$CC -m32"
CXX="$CXX -m32"
@@ -142,7 +142,7 @@ case $host in
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
with_unwind=${with_unwind:-no}
- elif test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes" -a "$cross_compiling" != "yes"
+ elif test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes"
then
if test "x${GCC}" = "xyes"
then
@@ -2001,7 +2001,7 @@ int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]
fi
dnl Extra errors for 32-on-64-bit mode, to catch address space issues
- if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes" -a "$cross_compiling" != "yes"
+ if test "x$enable_win64" != "xyes" -a "x$enable_win32on64" = "xyes"
then
WINE_TRY_CFLAGS([-Werror=extra-tokens],[EXTRACFLAGS="$EXTRACFLAGS -Werror=extra-tokens"])
WINE_TRY_CFLAGS([-Werror=implicit-function-declaration],[EXTRACFLAGS="$EXTRACFLAGS -Werror=implicit-function-declaration"])
--
2.37.1 (Apple Git-137.1)