From 564f7f2c3bdc1cbb93ccb9e1b8e67cf8d6701833 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 11 Feb 2010 13:23:08 +0000 Subject: [PATCH] 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. --- configure | 8 ++++---- configure.in | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3f33193c146..a126b03a548 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 78073 . +# From configure.in Revision: 78095 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 3.2. # @@ -4680,17 +4680,17 @@ echo "${ECHO_T}\"'-extract ppc7400'\"" >&6; } elif test "$UNIVERSAL_ARCHS" = "all" ; then UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64" LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386" - 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" LIPO_32BIT_FLAGS="-extract i386" - 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" LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386" - ARCH_RUN_32BIT="arch -i386 -ppc7400" + 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 a0ca8d50d4f..53efe8661c4 100644 --- a/configure.in +++ b/configure.in @@ -934,17 +934,17 @@ EOF elif test "$UNIVERSAL_ARCHS" = "all" ; then UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64" LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386" - 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" LIPO_32BIT_FLAGS="-extract i386" - 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" LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386" - ARCH_RUN_32BIT="arch -i386 -ppc7400" + 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])