diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-08 07:10:07 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-08 07:10:07 (GMT) |
| commit | 7ab74358ee288c68d47fccfb02d29d3e0fe27195 (patch) | |
| tree | 384e9aa5cfc980d5c0187c2b98eaa784cbaae30b /configure.in | |
| parent | 85d41c85264cc9d2a1e0980dd58ce56a9a311b6e (diff) | |
| download | cpython-7ab74358ee288c68d47fccfb02d29d3e0fe27195.zip cpython-7ab74358ee288c68d47fccfb02d29d3e0fe27195.tar.gz cpython-7ab74358ee288c68d47fccfb02d29d3e0fe27195.tar.bz2 | |
Merged revisions 74701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74701 | ronald.oussoren | 2009-09-07 08:12:00 +0200 (Mon, 07 Sep 2009) | 2 lines
Fix typo in configure.in
........
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/configure.in b/configure.in index ecfe4e7..9ad9f75 100644 --- a/configure.in +++ b/configure.in @@ -97,7 +97,7 @@ AC_SUBST(ARCH_RUN_32BIT) UNIVERSAL_ARCHS="32-bit" AC_MSG_CHECKING(for --with-universal-archs) AC_ARG_WITH(universal-archs, - AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit" or "all")), + AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")), [ AC_MSG_RESULT($withval) UNIVERSAL_ARCHS="$withval" @@ -926,6 +926,14 @@ yes) UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64" ARCH_RUN_32BIT="arch -i386 -ppc" + elif test "$UNIVERSAL_ARCHS" = "intel" ; then + UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64" + ARCH_RUN_32BIT="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" + else AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all]) @@ -951,6 +959,15 @@ yes) # that's the first OS release where # 4-way builds make sense. cur_target='10.5' + + elif test "${UNIVERSAL_ARCHS}" = "3-way"; then + cur_target='10.5' + + elif test "${UNIVERSAL_ARCHS}" = "intel"; then + cur_target='10.5' + + elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then + cur_target='10.5' fi else if test `arch` = "i386"; then @@ -1550,7 +1567,7 @@ case $ac_sys_system/$ac_sys_release in else LIBTOOL_CRUFT="" fi - AC_TRY_RUN([[ + AC_TRY_RUN([ #include <unistd.h> int main(int argc, char*argv[]) { @@ -1559,9 +1576,10 @@ case $ac_sys_system/$ac_sys_release in } else { return 1; } - ]], ac_osx_32bit=yes, + } + ], ac_osx_32bit=yes, ac_osx_32bit=no, - ac_osx_32bit=no) + ac_osx_32bit=yes) if test "${ac_osx_32bit}" = "yes"; then case `arch` in |