git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Inject $(ICU_LIBS) regardless of platform.

2017年8月21日 04:22:18 +0000 (21:22 -0700)

committer Noah Misch <noah@leadboat.com>

2017年8月21日 04:22:18 +0000 (21:22 -0700)

It appeared in a conditional that excludes AIX, Cygwin and MinGW. Give
ICU support a chance to work on those platforms. Back-patch to v10,
where ICU support was introduced.

src/backend/Makefile patch | blob | blame | history

diff --git a/src/backend/Makefile b/src/backend/Makefile

index bce9d2c3ebb09a06f2e7e1a39a097ef37ce749d0..aab676dbbdf7ff01f2444aeaed0f983ce1b8877f 100644 (file)

--- a/src/backend/Makefile

+++ b/src/backend/Makefile

@@ -39,8 +39,8 @@ OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \

$(top_builddir)/src/common/libpgcommon_srv.a

# We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add

-# libldap

-LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE)

+# libldap and ICU

+LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE) $(ICU_LIBS)

# The backend doesn't need everything that's in LIBS, however

LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))

@@ -58,7 +58,7 @@ ifneq ($(PORTNAME), win32)

ifneq ($(PORTNAME), aix)

postgres: $(OBJS)

- $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) $(ICU_LIBS) -o $@

+ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) -o $@

endif

This is the main PostgreSQL git repository.

RSS Atom