sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-20 00:02:41 -05:00
Code Issues Projects Releases Wiki Activity

headerscheck: Use ICU_CFLAGS

Browse Source 
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
This commit is contained in:
Peter Eisentraut 2025-08-29 09:00:29 +02:00
parent 991295f387
commit 664e0d6789
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/pginclude/headerscheck
View File

@ -44,6 +44,7 @@ CXXFLAGS=${CXXFLAGS:- -fsyntax-only -Wall}
MGLOB="$builddir/src/Makefile.global" MGLOB="$builddir/src/Makefile.global"
CPPFLAGS=`sed -n 's/^CPPFLAGS[ ]*=[ ]*//p' "$MGLOB"` CPPFLAGS=`sed -n 's/^CPPFLAGS[ ]*=[ ]*//p' "$MGLOB"`
CFLAGS=`sed -n 's/^CFLAGS[ ]*=[ ]*//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"` CC=`sed -n 's/^CC[ ]*=[ ]*//p' "$MGLOB"`
CXX=`sed -n 's/^CXX[ ]*=[ ]*//p' "$MGLOB"` CXX=`sed -n 's/^CXX[ ]*=[ ]*//p' "$MGLOB"`
PG_SYSROOT=`sed -n 's/^PG_SYSROOT[ ]*=[ ]*//p' "$MGLOB"` PG_SYSROOT=`sed -n 's/^PG_SYSROOT[ ]*=[ ]*//p' "$MGLOB"`
@ -64,11 +65,11 @@ if $cplusplus; then
-I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";; -I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";;
esac esac
done done
COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS" COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS $ICU_CFLAGS"
else else
ext=c ext=c
COMPILER=${CC:-gcc} COMPILER=${CC:-gcc}
COMPILER_FLAGS="$CPPFLAGS $CFLAGS" COMPILER_FLAGS="$CPPFLAGS $CFLAGS $ICU_CFLAGS"
fi fi
# Create temp directory. # Create temp directory.