[Python-checkins] cpython (merge 3.5 -> default): (merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.

xavier.degaye python-checkins at python.org
Sat Jul 30 05:40:02 EDT 2016


https://hg.python.org/cpython/rev/92b3ce7ca95c
changeset:   102493:92b3ce7ca95c
parent:      102491:ecc7bff738e0
parent:      102492:4cb94e561e2d
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sat Jul 30 11:36:32 2016 +0200
summary:
  (merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.
Patch by Chi Hsuan Yen.

files:
  Misc/NEWS    |  3 +++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 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.
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5370,7 +5370,7 @@
 
 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
--- a/configure.ac
+++ b/configure.ac
@@ -870,7 +870,7 @@
 
 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

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list