diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-03-24 20:45:31 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-03-24 20:45:31 -0400 |
| commit | 7caaeaf3607fae91318f24debce3dc017ca299a3 (patch) | |
| tree | a669017f987d80514f7a837bc60639964714511b /src | |
| parent | c1156411ad0879a71956b64aa487babe7572685b (diff) | |
| download | postgresql-7caaeaf3607fae91318f24debce3dc017ca299a3.tar.gz postgresql-7caaeaf3607fae91318f24debce3dc017ca299a3.zip | |
Link libpq after libpgfeutils to satisfy Windows linker.
Some of the non-MSVC Windows buildfarm members seem to need this to avoid
getting "undefined symbol" errors on libpgfeutils' references to libpq.
I could understand that if libpq were a static library, but surely it is
not? Oh well, at least the extra reference is no more harmful than it is
for libpgcommon or libpgport.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pgbench/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/psql/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/scripts/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index ea515fd9de4..95967893d82 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -17,7 +17,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils +LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \ diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile index 5e608b654b9..1503d00e12a 100644 --- a/src/bin/pgbench/Makefile +++ b/src/bin/pgbench/Makefile @@ -10,7 +10,7 @@ include $(top_builddir)/src/Makefile.global OBJS = pgbench.o exprparse.o $(WIN32RES) override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils +LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 6220d0d620f..d1c3b777c25 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) -LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils +LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ startup.o prompt.o variables.o large_obj.o describe.o \ diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 4e342ef8887..8c107b1ba43 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb pg_isready override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils +LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq all: $(PROGRAMS) |