NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit66ed382

committed

Inject $(ICU_LIBS) regardless of platform.

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

1 parentc629324 commit66ed382Copy full SHA for 66ed382

File tree

1 file changed

-3

lines changed

src/backend
- Makefile

1 file changed

-3

lines changed

`‎src/backend/Makefile`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \`
`39`	`39`	`$(top_builddir)/src/common/libpgcommon_srv.a`
`40`	`40`
`41`	`41`	`# We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add`
`42`		`-# libldap`
`43`		`-LIBS :=$(filter-out -lpgport -lpgcommon,$(LIBS))$(LDAP_LIBS_BE)`
	`42`	`+# libldap and ICU`
	`43`	`+LIBS :=$(filter-out -lpgport -lpgcommon,$(LIBS))$(LDAP_LIBS_BE)$(ICU_LIBS)`
`44`	`44`
`45`	`45`	`# The backend doesn't need everything that's in LIBS, however`
`46`	`46`	`LIBS :=$(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses,$(LIBS))`
`@@ -58,7 +58,7 @@ ifneq ($(PORTNAME), win32)`
`58`	`58`	`ifneq ($(PORTNAME), aix)`
`59`	`59`
`60`	`60`	`postgres:$(OBJS)`
`61`		`-$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(call expand_subsys,$^)$(LIBS)$(ICU_LIBS)-o$@`
	`61`	`+$(CC)$(CFLAGS)$(LDFLAGS)$(LDFLAGS_EX)$(export_dynamic)$(call expand_subsys,$^)$(LIBS) -o$@`
`62`	`62`
`63`	`63`	`endif`
`64`	`64`	`endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit66ed382

File tree

1 file changed

1 file changed

`‎src/backend/Makefile`

0 commit comments