diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-15 23:03:42 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-15 23:03:42 -0400 |
| commit | 63f32f3416a8b4f8e057dc184e8e8eae734ccc8a (patch) | |
| tree | 2ccb35b6717cac607c8e4cba5cc01e900150384b | |
| parent | 90c7b7d16bb3a90fc9168ff8942fbf78308e727d (diff) | |
| download | postgresql-63f32f3416a8b4f8e057dc184e8e8eae734ccc8a.tar.gz postgresql-63f32f3416a8b4f8e057dc184e8e8eae734ccc8a.zip | |
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.
| -rw-r--r-- | src/Makefile.global.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 96ef16396c8..b04d3826742 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -410,10 +410,9 @@ libpq = -L$(libpq_builddir) -lpq # pgport before libpq. This does cause duplicate -lpgport's to appear # on client link lines. ifdef PGXS -libpq_pgport = -L$(libdir) -lpgport -lpgcommon $(libpq) +libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq) else -libpq_pgport = -L$(top_builddir)/src/port -lpgport \ - -L$(top_builddir)/src/common -lpgcommon $(libpq) +libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq) endif # If PGXS is not defined, build libpq and libpgport dependancies as required. |