Skip to content

bpo-45798: Let libmpdec decide which archs to build on macOS as done previously #29949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2021
Merged

bpo-45798: Let libmpdec decide which archs to build on macOS as done previously #29949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down