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.)
This commit is contained in:
parent
7f28a7946a
commit
94c2ed0ebe
@ -232,6 +232,8 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
|
|||||||
CPP = @CPP@
|
CPP = @CPP@
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
|
||||||
|
override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS)
|
||||||
|
|
||||||
ifdef PGXS
|
ifdef PGXS
|
||||||
override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS)
|
override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS)
|
||||||
else # not PGXS
|
else # not PGXS
|
||||||
|
@ -8,8 +8,6 @@
|
|||||||
# this directory and SUBDIRS to subdirectories containing more things
|
# this directory and SUBDIRS to subdirectories containing more things
|
||||||
# to build.
|
# to build.
|
||||||
|
|
||||||
override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS)
|
|
||||||
|
|
||||||
ifdef PARTIAL_LINKING
|
ifdef PARTIAL_LINKING
|
||||||
# old style: linking using SUBSYS.o
|
# old style: linking using SUBSYS.o
|
||||||
subsysfilename = SUBSYS.o
|
subsysfilename = SUBSYS.o
|
||||||
|
@ -14,8 +14,7 @@ top_builddir = ../../..
|
|||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
|
override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
|
||||||
-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS) \
|
-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
|
||||||
$(ICU_CFLAGS)
|
|
||||||
|
|
||||||
OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
|
OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
|
||||||
stem_ISO_8859_1_danish.o \
|
stem_ISO_8859_1_danish.o \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user