[Python-checkins] r78155 - in python/branches/release26-maint: configure configure.in
ronald.oussoren
python-checkins at python.org
Thu Feb 11 14:27:59 CET 2010
Author: ronald.oussoren
Date: Thu Feb 11 14:27:59 2010
New Revision: 78155
Log:
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`
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/configure
python/branches/release26-maint/configure.in
Modified: python/branches/release26-maint/configure
==============================================================================
--- python/branches/release26-maint/configure (original)
+++ python/branches/release26-maint/configure Thu Feb 11 14:27:59 2010
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 78069 .
+# From configure.in Revision: 78151 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -4747,7 +4747,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.
@@ -12989,7 +12989,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)';;
@@ -13057,7 +13057,7 @@
if test "${ac_osx_32bit}" = "yes"; then
- case `arch` in
+ case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="i386"
;;
@@ -13071,7 +13071,7 @@
;;
esac
else
- case `arch` in
+ case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="x86_64"
;;
Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in (original)
+++ python/branches/release26-maint/configure.in Thu Feb 11 14:27:59 2010
@@ -996,7 +996,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.
@@ -1585,7 +1585,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)';;
@@ -1612,7 +1612,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"
;;
@@ -1624,7 +1624,7 @@
;;
esac
else
- case `arch` in
+ case `/usr/bin/arch` in
i386)
MACOSX_DEFAULT_ARCH="x86_64"
;;
More information about the Python-checkins
mailing list