Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Finish fix for issue 7715, after explicit search for calls to `arch`

This commit is contained in:
Ronald Oussoren 2010-02-11 13:26:54 +00:00
parent 9922f178d3
commit bc0e83c2b9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 77588 . # From configure.in Revision: 78150 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.7. # Generated by GNU Autoconf 2.61 for python 2.7.
# #
@ -4748,7 +4748,7 @@ echo "${ECHO_T}$CC" >&6; }
cur_target='10.5' cur_target='10.5'
fi fi
else else
if test `arch` = "i386"; then if test `/usr/bin/arch` = "i386"; then
# On Intel macs default to a deployment # On Intel macs default to a deployment
# target of 10.4, that's the first OSX # target of 10.4, that's the first OSX
# release with Intel support. # release with Intel support.
@ -14579,7 +14579,7 @@ case $ac_sys_system/$ac_sys_release in
if test "${enable_universalsdk}"; then if test "${enable_universalsdk}"; then
: :
else else
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
fi fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@ -14647,7 +14647,7 @@ fi
if test "${ac_osx_32bit}" = "yes"; then if test "${ac_osx_32bit}" = "yes"; then
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="i386" MACOSX_DEFAULT_ARCH="i386"
;; ;;
@ -14661,7 +14661,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
;; ;;
esac esac
else else
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="x86_64" MACOSX_DEFAULT_ARCH="x86_64"
;; ;;

8
configure.in
View File

@ -991,7 +991,7 @@ yes)
cur_target='10.5' cur_target='10.5'
fi fi
else else
if test `arch` = "i386"; then if test `/usr/bin/arch` = "i386"; then
# On Intel macs default to a deployment # On Intel macs default to a deployment
# target of 10.4, that's the first OSX # target of 10.4, that's the first OSX
# release with Intel support. # release with Intel support.
@ -1615,7 +1615,7 @@ case $ac_sys_system/$ac_sys_release in
if test "${enable_universalsdk}"; then if test "${enable_universalsdk}"; then
: :
else else
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
fi fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@ -1642,7 +1642,7 @@ case $ac_sys_system/$ac_sys_release in
ac_osx_32bit=yes) ac_osx_32bit=yes)
if test "${ac_osx_32bit}" = "yes"; then if test "${ac_osx_32bit}" = "yes"; then
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="i386" MACOSX_DEFAULT_ARCH="i386"
;; ;;
@ -1654,7 +1654,7 @@ case $ac_sys_system/$ac_sys_release in
;; ;;
esac esac
else else
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="x86_64" MACOSX_DEFAULT_ARCH="x86_64"
;; ;;