diff options
author | Marc-André Lemburg <mal@egenix.com> | 2010-04-30 17:29:56 (GMT) |
---|---|---|
committer | Marc-André Lemburg <mal@egenix.com> | 2010-04-30 17:29:56 (GMT) |
commit | df700f079069b16f2737dcd3cd75018fe8465e3f (patch) | |
tree | d2e65a49ebb23b82217cda00477b5a717b2c70af | |
parent | 0964ee1cf5ddbb1cbf367a1a1a69508983a14b04 (diff) | |
download | cpython-df700f079069b16f2737dcd3cd75018fe8465e3f.zip cpython-df700f079069b16f2737dcd3cd75018fe8465e3f.tar.gz cpython-df700f079069b16f2737dcd3cd75018fe8465e3f.tar.bz2 |
Merged revisions 80665 via svnmerge from
svn+pythonssh://pythondev@svn.python.org/python/trunk
........
r80665 | marc-andre.lemburg | 2010-04-30 19:20:14 +0200 (Fri, 30 Apr 2010) | 7 lines
[issue8211] configure: ignore AC_PROG_CC hardcoded CFLAGS
Only override the AC_PROG_CC determined CFLAGS if they were set by the user.
This restores the default behavior in the common case of not having CFLAGS
defined when running configure.
........
-rwxr-xr-x | configure | 11 | ||||
-rw-r--r-- | configure.in | 9 |
2 files changed, 15 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 80576 . +# From configure.in Revision: 80648 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.2. # @@ -3176,7 +3176,9 @@ then (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5 fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3968,7 +3970,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi diff --git a/configure.in b/configure.in index c127a63..0cd867c 100644 --- a/configure.in +++ b/configure.in @@ -478,9 +478,14 @@ then (it is also a good idea to do 'make clean' before compiling)]) fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" AC_PROG_CC -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi AC_SUBST(CXX) AC_SUBST(MAINCC) |