Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7caaeaf

Browse files
committed
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.
1 parent c115641 commit 7caaeaf

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/bin/pg_dump/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ top_builddir = ../../..
1717
include $(top_builddir)/src/Makefile.global
1818

1919
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
20-
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
20+
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
2121

2222
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
2323
pg_backup_null.o pg_backup_tar.o pg_backup_directory.o \

src/bin/pgbench/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include $(top_builddir)/src/Makefile.global
1010
OBJS = pgbench.o exprparse.o $(WIN32RES)
1111

1212
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
13-
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
13+
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
1414

1515
ifneq ($(PORTNAME), win32)
1616
override CFLAGS += $(PTHREAD_CFLAGS)

src/bin/psql/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
1919
REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
2020

2121
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
22-
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
22+
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
2323

2424
OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
2525
startup.o prompt.o variables.o large_obj.o describe.o \

src/bin/scripts/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
1919
PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb pg_isready
2020

2121
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
22-
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils
22+
LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq
2323

2424
all: $(PROGRAMS)
2525

0 commit comments

Comments
 (0)