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.
........

diff --git a/configure b/configure
index fc18e069bc7a4238fce95de7746a5cfede1b530d..4aec9aab2d93ea56dc8abcc1f104a7379f255062 100755 (executable)
--- 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

diff --git a/configure.in b/configure.in
index 8b03217d2b79fc01cb2c116a0bf0960186f75484..85c065f2bd30a0aa5a34fb05045f557dbad58657 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -912,15 +912,15 @@ yes)
 
                 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
                   AC_MSG_ERROR([proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way])