traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 78154 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78154 | ronald.oussoren | 2010-02-11 14:26:54 +0100 (Thu, 11 Feb 2010) | 2 lines

  Finish fix for issue 7715, after explicit search for calls to `arch`
........
This commit is contained in:
Ronald Oussoren 2010-02-11 13:38:58 +00:00
parent 564f7f2c3b
commit e3da75a773
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
# From configure.in Revision: 78095 .
# From configure.in Revision: 78152 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@ -4730,7 +4730,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
cur_target='10.5'
fi
else
if test `arch` = "i386"; then
if test `/usr/bin/arch` = "i386"; then
# On Intel macs default to a deployment
# target of 10.4, that's the first OSX
# release with Intel support.
@ -14449,7 +14449,7 @@ case $ac_sys_system/$ac_sys_release in
if test "${enable_universalsdk}"; then
:
else
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@ -14517,7 +14517,7 @@ fi
if test "${ac_osx_32bit}" = "yes"; then
case `arch` in
case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="i386"
;;
@ -14531,7 +14531,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
;;
esac
else
case `arch` in
case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="x86_64"
;;

8
configure.in
View File

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