(merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.

Patch by Chi Hsuan Yen.
This commit is contained in:
Xavier de Gaye 2016-07-30 11:36:32 +02:00
commit 6074f217db
3 changed files with 5 additions and 2 deletions

View File

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

2
configure vendored
View File

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

View File

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