From ddbab69b6d44085564a9b5022b96b002a52b2f2b Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Mon, 6 Dec 2021 21:35:50 -0500
Subject: [PATCH] bpo-45798: Let libmpdec decide which archs to build on macOS
 as done previously. (GH-29949)

---
 configure    | 16 ++--------------
 configure.ac | 11 +++--------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/configure b/configure
index 2237e6ed8ce..608055d91fa 100755
--- a/configure
+++ b/configure
@@ -11815,21 +11815,9 @@ esac
 
 libmpdec_machine=unknown
 if test "$libmpdec_system" = Darwin; then
-    case $MACOSX_DEFAULT_ARCH in #(
-  i386) :
-    libmpdec_machine=ansi32 ;; #(
-  ppc) :
-    libmpdec_machine=ansi32 ;; #(
-  x86_64) :
-    libmpdec_machine=x64 ;; #(
-  ppc64) :
-    libmpdec_machine=ansi64 ;; #(
-  arm64) :
-    libmpdec_machine=ansi64 ;; #(
-  *) :
+    # universal here means: build libmpdec with the same arch options
+    # the python interpreter was built with
     libmpdec_machine=universal
-     ;;
-esac
 elif test $ac_cv_sizeof_size_t -eq 8; then
     if test "$ac_cv_gcc_asm_for_x64" = yes; then
         libmpdec_machine=x64
diff --git a/configure.ac b/configure.ac
index f1aac2db71f..7cc6c0c2f59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3295,14 +3295,9 @@ AS_CASE([$ac_sys_system],
 
 libmpdec_machine=unknown
 if test "$libmpdec_system" = Darwin; then
-    AS_CASE([$MACOSX_DEFAULT_ARCH],
-      [i386],   [libmpdec_machine=ansi32],
-      [ppc],    [libmpdec_machine=ansi32],
-      [x86_64], [libmpdec_machine=x64],
-      [ppc64],  [libmpdec_machine=ansi64],
-      [arm64],  [libmpdec_machine=ansi64],
-      [libmpdec_machine=universal]
-    )
+    # universal here means: build libmpdec with the same arch options
+    # the python interpreter was built with
+    libmpdec_machine=universal
 elif test $ac_cv_sizeof_size_t -eq 8; then
     if test "$ac_cv_gcc_asm_for_x64" = yes; then
         libmpdec_machine=x64