summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2025-08-29 09:00:29 +0200
committerPeter Eisentraut <peter@eisentraut.org>2025-08-29 09:01:46 +0200
commit664e0d678965719fe0d385aa3a8f2777058b119b (patch)
treee8da2b6b38ad0fb3e60a17230690acfe40084ffb /src
parent991295f387a6a453fe061831bcc36294989fe77b (diff)
headerscheck: Use ICU_CFLAGS
Otherwise, headerscheck will fail if the ICU headers are in a location not reached by the normal CFLAGS/CPPFLAGS: ../src/include/utils/pg_locale.h:21:10: fatal error: unicode/ucol.h: No such file or directory Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/flat/1127775.1754417387%40sss.pgh.pa.us
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/pginclude/headerscheck5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index 9e86d049362..30afa967305 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"`
+ICU_CFLAGS=`sed -n 's/^ICU_CFLAGS[ ]*=[ ]*//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"`
@@ -64,11 +65,11 @@ if $cplusplus; then
-I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";;
esac
done
- COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS"
+ COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS $ICU_CFLAGS"
else
ext=c
COMPILER=${CC:-gcc}
- COMPILER_FLAGS="$CPPFLAGS $CFLAGS"
+ COMPILER_FLAGS="$CPPFLAGS $CFLAGS $ICU_CFLAGS"
fi
# Create temp directory.