Skip to content

Commit ddbab69

Browse files
authored
bpo-45798: Let libmpdec decide which archs to build on macOS as done previously. (GH-29949)
1 parent c5c3652 commit ddbab69

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

configure

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11815,21 +11815,9 @@ esac
1181511815

1181611816
libmpdec_machine=unknown
1181711817
if test "$libmpdec_system" = Darwin; then
11818-
case $MACOSX_DEFAULT_ARCH in #(
11819-
i386) :
11820-
libmpdec_machine=ansi32 ;; #(
11821-
ppc) :
11822-
libmpdec_machine=ansi32 ;; #(
11823-
x86_64) :
11824-
libmpdec_machine=x64 ;; #(
11825-
ppc64) :
11826-
libmpdec_machine=ansi64 ;; #(
11827-
arm64) :
11828-
libmpdec_machine=ansi64 ;; #(
11829-
*) :
11818+
# universal here means: build libmpdec with the same arch options
11819+
# the python interpreter was built with
1183011820
libmpdec_machine=universal
11831-
;;
11832-
esac
1183311821
elif test $ac_cv_sizeof_size_t -eq 8; then
1183411822
if test "$ac_cv_gcc_asm_for_x64" = yes; then
1183511823
libmpdec_machine=x64

configure.ac

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,14 +3295,9 @@ AS_CASE([$ac_sys_system],
32953295

32963296
libmpdec_machine=unknown
32973297
if test "$libmpdec_system" = Darwin; then
3298-
AS_CASE([$MACOSX_DEFAULT_ARCH],
3299-
[i386], [libmpdec_machine=ansi32],
3300-
[ppc], [libmpdec_machine=ansi32],
3301-
[x86_64], [libmpdec_machine=x64],
3302-
[ppc64], [libmpdec_machine=ansi64],
3303-
[arm64], [libmpdec_machine=ansi64],
3304-
[libmpdec_machine=universal]
3305-
)
3298+
# universal here means: build libmpdec with the same arch options
3299+
# the python interpreter was built with
3300+
libmpdec_machine=universal
33063301
elif test $ac_cv_sizeof_size_t -eq 8; then
33073302
if test "$ac_cv_gcc_asm_for_x64" = yes; then
33083303
libmpdec_machine=x64

0 commit comments

Comments
 (0)