From ec1da8265908b6d6761973fda54aa0008dd033c5 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Wed, 18 Mar 2026 12:58:47 +0100
Subject: [PATCH] headerscheck: Get CXXFLAGS (variant 1)

---
 src/tools/pginclude/headerscheck | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index 3d3e371a8e1..4a66a194b46 100755
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -44,6 +44,7 @@ CXXFLAGS=${CXXFLAGS:- -fsyntax-only -Wall}
 MGLOB="$builddir/src/Makefile.global"
 CPPFLAGS=`sed -n 's/^CPPFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 CFLAGS=`sed -n 's/^CFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
+_CXXFLAGS=`sed -n 's/^CXXFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 ICU_CFLAGS=`sed -n 's/^ICU_CFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 LLVM_CPPFLAGS=`sed -n 's/^LLVM_CPPFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 CC=`sed -n 's/^CC[ 	]*=[ 	]*//p' "$MGLOB"`
@@ -60,8 +61,8 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed "s|\\\$(PG_SYSROOT)|$PG_SYSROOT|g"`
 if $cplusplus; then
 	ext=cpp
 	COMPILER=${CXX:-g++}
-	# Extract any -I and -D switches from CPPFLAGS.
-	for flag in $CPPFLAGS; do
+	# Extract any -I and -D switches from CPPFLAGS and CXXFLAGS from Makefile.global.
+	for flag in $CPPFLAGS $_CXXFLAGS; do
 	  case $flag in
 	    -I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";;
 	  esac
-- 
2.53.0