From be4c71f74be2a236baa9c1fd8d39d2879d34dadf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 11 Dec 2023 18:30:09 +0100 Subject: [PATCH] Default to arm64 + x86_64 universal binaries for wxOSX Using i386 by default isn't useful any more -- but using arm64 is. --- configure | 6 ++---- configure.ac | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 30f90e8582..66a86bbb24 100755 --- a/configure +++ b/configure @@ -22839,10 +22839,8 @@ $as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-univers if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY - else OSX_ARCH_OPTS="i386" - if test "$wxUSE_OSX_COCOA" = 1; then - OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64" - fi + else + OSX_ARCH_OPTS=arm64,x86_64 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5 diff --git a/configure.ac b/configure.ac index d8919d3cc9..0d153fd654 100644 --- a/configure.ac +++ b/configure.ac @@ -1160,11 +1160,9 @@ if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY - else dnl Use all architectures supported - OSX_ARCH_OPTS="i386" - if test "$wxUSE_OSX_COCOA" = 1; then - OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64" - fi + else + dnl Default architectures for the universal binaries. + OSX_ARCH_OPTS=arm64,x86_64 fi AC_MSG_CHECKING([for architectures to use in universal binary])