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.

diff --git a/src/backend/replication/pgoutput/Makefile b/src/backend/replication/pgoutput/Makefile
index 1b68e2b4b6690b061a458de46586534124270c03..cbe444bae30b28dd3de0bd732e39460d5ccb2517 100644 (file)
--- 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 bb2efed3ce5b788ccf56c9004bba7727843bdb59..3aaa8a9f04b7ed884a6d372afc1abf13aac4aee8 100644 (file)
--- 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 5f26a091d255f01e3a5137ab5b67a52f8354a24f..7abbd01971ad0837c9694e5fc8ba422ac0a82bdd 100644 (file)
--- 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