diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-01-20 12:51:31 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-01-20 12:51:31 -0500 |
| commit | 0502e854640bd024f349c0df46b7dd6812b8c05c (patch) | |
| tree | 6af170141bcf667a7795b339d7dd727ebd934f34 /src | |
| parent | cdc2a70470bdbe3663dc464deb753d6d931bba61 (diff) | |
| download | postgresql-0502e854640bd024f349c0df46b7dd6812b8c05c.tar.gz postgresql-0502e854640bd024f349c0df46b7dd6812b8c05c.zip | |
Try to fix non-MSVC Windows builds in the wake of logical replication.
pgoutput evidently needs to be built without -DBUILDING_DLL. (It seems
like a pretty bad idea that these makefiles need to know exactly where
all the shlibs are in the tree, or maybe what's bad is putting them under
src/backend/. But right now is not the time to redesign that.)
Also, remove "override CPPFLAGS" in pgoutput's Makefile. I don't think
that that actually has any bad consequences, but it's certainly useless
in a directory that has no .h files, and it might be contributing to the
failure somehow.
Per buildfarm.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/pgoutput/Makefile | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.cygwin | 4 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win32 | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/replication/pgoutput/Makefile b/src/backend/replication/pgoutput/Makefile index 1b68e2b4b66..cbe444bae30 100644 --- a/src/backend/replication/pgoutput/Makefile +++ b/src/backend/replication/pgoutput/Makefile @@ -12,8 +12,6 @@ subdir = src/backend/replication/pgoutput top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global -override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) - OBJS = pgoutput.o $(WIN32RES) PGFILEDESC = "pgoutput - standard logical replication output plugin" NAME = pgoutput diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index bb2efed3ce5..3aaa8a9f04b 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -16,13 +16,15 @@ CFLAGS_SL = ifneq (,$(findstring backend,$(subdir))) ifeq (,$(findstring conversion_procs,$(subdir))) -ifeq (,$(findstring snowball,$(subdir))) ifeq (,$(findstring libpqwalreceiver,$(subdir))) +ifeq (,$(findstring replication/pgoutput,$(subdir))) +ifeq (,$(findstring snowball,$(subdir))) override CPPFLAGS+= -DBUILDING_DLL endif endif endif endif +endif ifneq (,$(findstring src/common,$(subdir))) override CPPFLAGS+= -DBUILDING_DLL diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index 5f26a091d25..7abbd01971a 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -14,13 +14,15 @@ CFLAGS_SL = ifneq (,$(findstring backend,$(subdir))) ifeq (,$(findstring conversion_procs,$(subdir))) -ifeq (,$(findstring snowball,$(subdir))) ifeq (,$(findstring libpqwalreceiver,$(subdir))) +ifeq (,$(findstring replication/pgoutput,$(subdir))) +ifeq (,$(findstring snowball,$(subdir))) override CPPFLAGS+= -DBUILDING_DLL endif endif endif endif +endif ifneq (,$(findstring src/common,$(subdir))) override CPPFLAGS+= -DBUILDING_DLL |