Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit94c2ed0

Browse files
committed
Add ICU_CFLAGS to global CPPFLAGS
The original code only added ICU_CFLAGS to the backend build. But it isalso needed for building external modules that include pg_locale.h. Soadd it to the global CPPFLAGS. (This is only relevant if ICU is not ina compiler default path, so it apparently hasn't bitten many.)
1 parent7f28a79 commit94c2ed0

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

‎src/Makefile.global.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ PTHREAD_LIBS= @PTHREAD_LIBS@
232232
CPP = @CPP@
233233
CPPFLAGS = @CPPFLAGS@
234234

235+
overrideCPPFLAGS :=$(CPPFLAGS)$(ICU_CFLAGS)
236+
235237
ifdefPGXS
236238
overrideCPPFLAGS := -I$(includedir_server) -I$(includedir_internal)$(CPPFLAGS)
237239
else# not PGXS

‎src/backend/common.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
# this directory and SUBDIRS to subdirectories containing more things
99
# to build.
1010

11-
overrideCPPFLAGS :=$(CPPFLAGS)$(ICU_CFLAGS)
12-
1311
ifdefPARTIAL_LINKING
1412
# old style: linking using SUBSYS.o
1513
subsysfilename = SUBSYS.o

‎src/backend/snowball/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ top_builddir = ../../..
1414
include$(top_builddir)/src/Makefile.global
1515

1616
overrideCPPFLAGS := -I$(top_srcdir)/src/include/snowball\
17-
-I$(top_srcdir)/src/include/snowball/libstemmer$(CPPFLAGS)\
18-
$(ICU_CFLAGS)
17+
-I$(top_srcdir)/src/include/snowball/libstemmer$(CPPFLAGS)
1918

2019
OBJS=$(WIN32RES) dict_snowball.o api.o utilities.o\
2120
stem_ISO_8859_1_danish.o\

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp