diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-06-12 15:57:22 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-06-12 15:57:22 -0400 |
| commit | 94c2ed0ebe005aa6389b02a61e3c16d08035299c (patch) | |
| tree | 2988263b6bb31a070d487d333cc6c1420497e589 /src | |
| parent | 7f28a7946a37e1716fe12c9e8466dbb868292087 (diff) | |
| download | postgresql-94c2ed0ebe005aa6389b02a61e3c16d08035299c.tar.gz postgresql-94c2ed0ebe005aa6389b02a61e3c16d08035299c.zip | |
Add ICU_CFLAGS to global CPPFLAGS
The original code only added ICU_CFLAGS to the backend build. But it is
also needed for building external modules that include pg_locale.h. So
add it to the global CPPFLAGS. (This is only relevant if ICU is not in
a compiler default path, so it apparently hasn't bitten many.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 2 | ||||
| -rw-r--r-- | src/backend/common.mk | 2 | ||||
| -rw-r--r-- | src/backend/snowball/Makefile | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 7af91e2d586..dc8a89af8e2 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -232,6 +232,8 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS) + ifdef PGXS override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS) else # not PGXS diff --git a/src/backend/common.mk b/src/backend/common.mk index 0b57543bc4a..5d599dbd0ca 100644 --- a/src/backend/common.mk +++ b/src/backend/common.mk @@ -8,8 +8,6 @@ # this directory and SUBDIRS to subdirectories containing more things # to build. -override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS) - ifdef PARTIAL_LINKING # old style: linking using SUBSYS.o subsysfilename = SUBSYS.o diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index 518178ff396..50cbace41da 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -14,8 +14,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \ - -I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS) \ - $(ICU_CFLAGS) + -I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS) OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \ stem_ISO_8859_1_danish.o \ |