headerscheck: Use LLVM_CPPFLAGS

Otherwise, headerscheck will fail if the LLVM headers are in a
location not reached by the normal CFLAGS/CPPFLAGS.

Discussion: https://www.postgresql.org/message-id/flat/b49e74d4-3cf9-4d1c-9dce-09f75e55d026%40eisentraut.org

diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index a52a5580bdcb3f32e720b542ba29663a3fd543cb..bf4992e33ae48b13f2360876689405db35e9288e 100755 (executable)
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -45,6 +45,7 @@ MGLOB="$builddir/src/Makefile.global"
 CPPFLAGS=`sed -n 's/^CPPFLAGS[     ]*=[    ]*//p' "$MGLOB"`
 CFLAGS=`sed -n 's/^CFLAGS[     ]*=[    ]*//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"`
 CXX=`sed -n 's/^CXX[   ]*=[    ]*//p' "$MGLOB"`
 PG_SYSROOT=`sed -n 's/^PG_SYSROOT[     ]*=[    ]*//p' "$MGLOB"`
@@ -65,11 +66,11 @@ if $cplusplus; then
        -I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";;
      esac
    done
-   COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS $ICU_CFLAGS"
+   COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS $ICU_CFLAGS $LLVM_CPPFLAGS"
 else
    ext=c
    COMPILER=${CC:-gcc}
-   COMPILER_FLAGS="$CPPFLAGS $CFLAGS $ICU_CFLAGS"
+   COMPILER_FLAGS="$CPPFLAGS $CFLAGS $ICU_CFLAGS $LLVM_CPPFLAGS"
 fi
 
 # Create temp directory.