diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 17:59:37 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 17:59:37 (GMT) |
| commit | 974eb5eace4187c81f2bc13022260467eb72c82b (patch) | |
| tree | f319e3f53a705f4ef509be87432d84cad0608b8e | |
| parent | 287128aadca2688475576a17d69a56c0cb064d6a (diff) | |
| download | cpython-974eb5eace4187c81f2bc13022260467eb72c82b.zip cpython-974eb5eace4187c81f2bc13022260467eb72c82b.tar.gz cpython-974eb5eace4187c81f2bc13022260467eb72c82b.tar.bz2 | |
Add the OSX universal binary related options
to CFLAGS instead of BASECFLAGS.
This fixes issue 8366 and is needed due to
changes introduced in the fix for issue 1628484.
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 13 insertions, 11 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 79652 . +# From configure.in Revision: 79902 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.7. # @@ -4816,11 +4816,12 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int fi - BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - tgt=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'` - if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then - CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}" - CPPFLAGS="-isysroot ${UNIVERSALSDK}" + CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}" + if test "${UNIVERSALSDK}" != "/" + then + CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}" + LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}" + CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}" fi fi diff --git a/configure.in b/configure.in index 68e6d5a..a7a0814 100644 --- a/configure.in +++ b/configure.in @@ -1052,11 +1052,12 @@ yes) fi - BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - tgt=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` - if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then - CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}" - CPPFLAGS="-isysroot ${UNIVERSALSDK}" + CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}" + if test "${UNIVERSALSDK}" != "/" + then + CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}" + LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}" + CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}" fi fi |