diff options
author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-07-30 11:36:32 +0200 |
---|---|---|
committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-07-30 11:36:32 +0200 |
commit | 6074f217db7433b8ba7b025c1264b97396e32924 (patch) | |
tree | 3f4ad8bdc387f55cca104c22a6f9c024d05d42fe | |
parent | d78448e912126410117723c7d240bbdfff06df16 (diff) | |
parent | 3a32bdfaa7494bfc172b04bdb1c8159978af8d42 (diff) | |
download | cpython-git-6074f217db7433b8ba7b025c1264b97396e32924.tar.gz |
(merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.
Patch by Chi Hsuan Yen.
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -88,6 +88,9 @@ Windows Build ----- +- Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by + Chi Hsuan Yen. + - Issue #27490: Do not build pgen when cross-compiling. Patch by Thomas Perl. @@ -5370,7 +5370,7 @@ cat >> conftest.c <<EOF EOF -if $CPP conftest.c >conftest.out 2>/dev/null; then +if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5 $as_echo "$PLATFORM_TRIPLET" >&6; } diff --git a/configure.ac b/configure.ac index 34ce82c740..1f3aba0997 100644 --- a/configure.ac +++ b/configure.ac @@ -870,7 +870,7 @@ cat >> conftest.c <<EOF EOF -if $CPP conftest.c >conftest.out 2>/dev/null; then +if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` AC_MSG_RESULT([$PLATFORM_TRIPLET]) else |