Commit 63f32f34 authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent 90c7b7d1
...@@ -410,10 +410,9 @@ libpq = -L$(libpq_builddir) -lpq ...@@ -410,10 +410,9 @@ libpq = -L$(libpq_builddir) -lpq
# pgport before libpq. This does cause duplicate -lpgport's to appear # pgport before libpq. This does cause duplicate -lpgport's to appear
# on client link lines. # on client link lines.
ifdef PGXS ifdef PGXS
libpq_pgport = -L$(libdir) -lpgport -lpgcommon $(libpq) libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
else else
libpq_pgport = -L$(top_builddir)/src/port -lpgport \ libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
-L$(top_builddir)/src/common -lpgcommon $(libpq)
endif endif
# If PGXS is not defined, build libpq and libpgport dependancies as required. # If PGXS is not defined, build libpq and libpgport dependancies as required.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment