diff options
| author | Noah Misch <noah@leadboat.com> | 2017-08-20 21:22:18 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2017-08-20 21:22:33 -0700 |
| commit | b8a25494819ac2551a71674effb7f50a7b7b74f6 (patch) | |
| tree | 54e176595d667edeae7cad0d8d86477d16e22b44 | |
| parent | 1c3869c0bea4376bcbb358e1abf5ed95e8c41865 (diff) | |
| download | postgresql-b8a25494819ac2551a71674effb7f50a7b7b74f6.tar.gz postgresql-b8a25494819ac2551a71674effb7f50a7b7b74f6.zip | |
Inject $(ICU_LIBS) regardless of platform.
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.
| -rw-r--r-- | src/backend/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index bce9d2c3ebb..aab676dbbdf 100644 --- 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 endif |