Merged revisions 78156 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78156 | ronald.oussoren | 2010-02-11 14:38:58 +0100 (Thu, 11 Feb 2010) | 9 lines
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`
........
................
diff --git a/configure.in b/configure.in
index 85c065f..0022d02 100644
--- a/configure.in
+++ b/configure.in
@@ -958,7 +958,7 @@
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.
@@ -1526,7 +1526,7 @@
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)';;
@@ -1553,7 +1553,7 @@
ac_osx_32bit=yes)
if test "${ac_osx_32bit}" = "yes"; then
- case `arch` in
+ case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="i386"
;;
@@ -1565,7 +1565,7 @@
;;
esac
else
- case `arch` in
+ case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="x86_64"
;;