summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-02-11 13:24:45 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-02-11 13:24:45 (GMT)
commitc8c89c4e6292df2ed1c269f51e7dc51b380f9e5b (patch)
tree3d9b3766fe87e7dfa6115792f8efeede1c2fa209 /configure
parent733ecdcc2f88a4231853c364aacb702b7a6949f9 (diff)
downloadcpython-c8c89c4e6292df2ed1c269f51e7dc51b380f9e5b.zip
cpython-c8c89c4e6292df2ed1c269f51e7dc51b380f9e5b.tar.gz
cpython-c8c89c4e6292df2ed1c269f51e7dc51b380f9e5b.tar.bz2
Merged revisions 78152 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r78152 | ronald.oussoren | 2010-02-11 14:23:08 +0100 (Thu, 11 Feb 2010) | 4 lines Fix for issue #7715: explicitly use the system arch instead of whatever is on the user's path. This is needed because GNU arch is not necessarily compatible with Apple's version. ........
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index fc18e06..4aec9aa 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 78068 .
+# From configure.in Revision: 78074 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -4655,15 +4655,15 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
elif test "$UNIVERSAL_ARCHS" = "all" ; then
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
- ARCH_RUN_32BIT="arch -i386 -ppc"
+ ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
elif test "$UNIVERSAL_ARCHS" = "intel" ; then
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
- ARCH_RUN_32BIT="arch -i386"
+ ARCH_RUN_32BIT="/usr/bin/arch -i386"
elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
- ARCH_RUN_32BIT="arch -i386 -ppc"
+ ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
else
{ { echo "$as_me:$LINENO: error: proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" >&5