mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ronald Oussoren 2010-04-18 17:59:37 +00:00
parent 287128aadc
commit 974eb5eace
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -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

11
configure.in
View File

@ -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