summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-04-08 08:13:31 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-04-08 08:13:31 (GMT)
commit7591285fc31a84899370802c7f551afdaa386f74 (patch)
tree1552e1eb486611bc1ad97e2d9ba791484ed85190 /configure.in
parentefc2f497fdbc31300e99712f44353a8b6f3d4879 (diff)
downloadcpython-7591285fc31a84899370802c7f551afdaa386f74.zip
cpython-7591285fc31a84899370802c7f551afdaa386f74.tar.gz
cpython-7591285fc31a84899370802c7f551afdaa386f74.tar.bz2
This check-in fixes two problems:
1) A non-critical off-by-one error in pythonw 2) A problem in the configure script that caused builds with '--enable-framework --enable-universalsdk=/' to fail on OSX 10.6.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in31
1 files changed, 1 insertions, 30 deletions
diff --git a/configure.in b/configure.in
index bdc5b6c..68e6d5a 100644
--- a/configure.in
+++ b/configure.in
@@ -1024,36 +1024,7 @@ yes)
if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
ARCH_RUN_32BIT=""
- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
-
-
- # You have to use different flags on various versions of
- # OSX to extract PPC code from an universal binary, basically
- # '-arch ppc' on OSX 10.4 and '-arch ppc7400' on anything
- # newer.
- # Because '-arch pp7400' works on OSX 10.5 or higher this
- # test is only present in the '32-bit' branch, all other
- # branches require OSX 10.5 to compile.
-
- AC_MSG_CHECKING(lipo flag for extracting ppc code)
- FN="test.$$"
- cat >${FN}.c <<-EOF
- int main() { return 0; }
-EOF
- ${CC} ${CFLAGS} -arch ppc -arch i386 -o ${FN} ${FN}.c -isysroot ${UNIVERSALSDK}
- if test $? != 0 ; then
- rm ${FN} ${FN}.c
- AC_MSG_RESULT([failed, assumee -extract ppc7400])
- else
- lipo -extract -output "${FN}.out" -arch ppc7400 "${FN}" 2>/dev/null
- if test $? != 0 ; then
- LIPO_32BIT_FLAGS="-extract ppc -extract i386"
- AC_MSG_RESULT("'-extract ppc'")
- else
- AC_MSG_RESULT("'-extract ppc7400'")
- fi
- rm -f ${FN} ${FN}.c ${FN}.out
- fi
+ LIPO_32BIT_FLAGS=""
elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"