diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:14:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:14:02 (GMT) |
| commit | 051858e8a0ebf4b8df6bb817658ef02dcefeac3b (patch) | |
| tree | cc5d278fbc4c54c51056dc48c9ddd55e1b620302 /configure.in | |
| parent | a0820897a8579534b8cf6ea09be2c2431f7107f9 (diff) | |
| download | cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.zip cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.tar.gz cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.tar.bz2 | |
Merged revisions 79902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79902 | ronald.oussoren | 2010-04-08 03:13:31 -0500 (Thu, 08 Apr 2010) | 9 lines
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.in | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/configure.in b/configure.in index f240ee6..0ec9dcf 100644 --- a/configure.in +++ b/configure.in @@ -915,36 +915,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 "${FN}" -extract ppc7400 -output "${FN}.out" 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" LIPO_32BIT_FLAGS="" |