From 3a32bdfaa7494bfc172b04bdb1c8159978af8d42 Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Sat, 30 Jul 2016 11:28:35 +0200 Subject: [PATCH] Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by Chi Hsuan Yen. --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ configure | 2 +- configure.ac | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS index a4a4cdc3cb4..150d37a3a32 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1663,3 +1663,4 @@ Gennadiy Zlobin Doug Zongker Peter Åstrand evilzero +Chi Hsuan Yen diff --git a/Misc/NEWS b/Misc/NEWS index 243f1263eca..6b2b41921fe 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -145,6 +145,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. diff --git a/configure b/configure index f0cf515c28d..bb89a5a059b 100755 --- a/configure +++ b/configure @@ -5369,7 +5369,7 @@ cat >> 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 bf2a348f825..8135c716f3c 100644 --- a/configure.ac +++ b/configure.ac @@ -870,7 +870,7 @@ cat >> 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