diff options
| author | Ned Deily <nad@python.org> | 2021-12-07 02:35:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 02:35:50 (GMT) |
| commit | ddbab69b6d44085564a9b5022b96b002a52b2f2b (patch) | |
| tree | 1b0d2701150a6ad2042972c9b178c1b157efa187 | |
| parent | c5c365220ed2c867fe81078f70b827de22db2ee6 (diff) | |
| download | cpython-ddbab69b6d44085564a9b5022b96b002a52b2f2b.zip cpython-ddbab69b6d44085564a9b5022b96b002a52b2f2b.tar.gz cpython-ddbab69b6d44085564a9b5022b96b002a52b2f2b.tar.bz2 | |
bpo-45798: Let libmpdec decide which archs to build on macOS as done previously. (GH-29949)
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 5 insertions, 22 deletions
@@ -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 f1aac2d..7cc6c0c 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 |