From 46be09e91aa5a9e1be219f1a8b74621b16b9f2d6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 24 Mar 2005 23:53:48 +0000 Subject: [PATCH] Revert ill-conceived change of libpq linkage --- breaks ecpg. --- src/Makefile.global.in | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 609b080cfc..5ef19a1e43 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.210 2005/03/24 19:33:32 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.211 2005/03/24 23:53:48 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -306,17 +306,7 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq libpq_builddir = $(top_builddir)/src/interfaces/libpq endif -# Force clients to pull symbols from the non-shared library libpgport -# rather than pulling some libpgport symbols from libpq just because -# libpq uses those functions too. This makes applications less -# dependent on changes in libpq's usage of pgport. To do this we link to -# pgport before libpq. This does cause duplicate -lpgport's to appear -# on client link lines. -ifdef PGXS -libpq = -L$(libdir) -lpgport -L$(libpq_builddir) -lpq -else -libpq = -L$(top_builddir)/src/port -lpgport -L$(libpq_builddir) -lpq -endif +libpq = -L$(libpq_builddir) -lpq # If doing static linking, shared library dependency can't be # used so we specify pthread libs for every usage of libpq -- 2.11.0