From 3ad7ba10a20827b24d4b1aa9dd49474db8affbdd Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 19 Aug 2008 17:16:56 +0000
Subject: [PATCH] Merged revisions 65652-65653 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65652 | ronald.oussoren | 2008-08-12 07:29:13 -0500 (Tue, 12 Aug 2008) | 2 lines
Fix typo in the `arch` commandline
........
r65653 | ronald.oussoren | 2008-08-12 07:41:45 -0500 (Tue, 12 Aug 2008) | 3 lines
Another fix for 4-way universal builds, use the right #ifndef guard
to detect the OSX 10.5 SDK.
........
---
configure | 4 ++--
configure.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 51fa04021e..9130631871 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 65034 .
+# From configure.in Revision: 65206 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.0.
#
@@ -4601,7 +4601,7 @@ 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 -386 -ppc"
+ ARCH_RUN_32BIT="arch -i386 -ppc"
else
{ { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5
diff --git a/configure.in b/configure.in
index 870b8a9379..b8a457593e 100644
--- a/configure.in
+++ b/configure.in
@@ -871,7 +871,7 @@ yes)
elif test "$UNIVERSAL_ARCHS" = "all" ; then
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
- ARCH_RUN_32BIT="arch -386 -ppc"
+ ARCH_RUN_32BIT="arch -i386 -ppc"
else
AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
--
2.49.0