Skip to content

Commit 63f32f3

Browse files
committed
Switch order of -lpgport and -lpgcommon
Conceptually, libpgcommon can depend on libpgport, but not the other way around. In the past, this might not have mattered, but it's needed now for asprintf.
1 parent 90c7b7d commit 63f32f3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/Makefile.global.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,9 @@ libpq = -L$(libpq_builddir) -lpq
410410
# pgport before libpq. This does cause duplicate -lpgport's to appear
411411
# on client link lines.
412412
ifdef PGXS
413-
libpq_pgport = -L$(libdir) -lpgport -lpgcommon $(libpq)
413+
libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
414414
else
415-
libpq_pgport = -L$(top_builddir)/src/port -lpgport \
416-
-L$(top_builddir)/src/common -lpgcommon $(libpq)
415+
libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
417416
endif
418417

419418
# If PGXS is not defined, build libpq and libpgport dependancies as required.

0 commit comments

Comments
 (0)