diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 17:59:37 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 17:59:37 +0000 |
| commit | bf354a4a82ecc7187f75c161622a1c1fb74f16ae (patch) | |
| tree | 87a4db65ac291a50e47258e0c4becc814ea6b28a /configure.in | |
| parent | 2c7e8a7aba4d42cef1a21e4f2a9b5e01774af972 (diff) | |
| download | cpython-bf354a4a82ecc7187f75c161622a1c1fb74f16ae.tar.gz | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 68e6d5af95..a7a08147c1 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 |