database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Restore linking libpq into pg_ctl on Mingw builds.

Browse Source 
Commit 1ae853654 missed this.  Per Andrew Dunstan.
This commit is contained in:
Tom Lane 2017-07-05 15:23:22 -04:00
parent 6deb52b202
commit ff68e909ac
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_ctl/Makefile
View File

@ -16,12 +16,20 @@ subdir = src/bin/pg_ctl
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
# On Windows, we need to link with libpq, just for use of pqexpbuffer;
# but let's not pull that in on platforms where we don't need it.
ifeq ($(PORTNAME), win32)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
SUBMAKE_LIBPQ := submake-libpq
LIBPQ_PGPORT := $(libpq_pgport)
endif
OBJS= pg_ctl.o $(WIN32RES) OBJS= pg_ctl.o $(WIN32RES)
all: pg_ctl all: pg_ctl
pg_ctl: $(OBJS) | submake-libpgport pg_ctl: $(OBJS) | submake-libpgport $(SUBMAKE_LIBPQ)
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) $(CC) $(CFLAGS) $(OBJS) $(LIBPQ_PGPORT) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
install: all installdirs install: all installdirs
$(INSTALL_PROGRAM) pg_ctl$(X) '$(DESTDIR)$(bindir)/pg_ctl$(X)' $(INSTALL_PROGRAM) pg_ctl$(X) '$(DESTDIR)$(bindir)/pg_ctl$(X)'