Commit 0502e854 authored by Tom Lane's avatar Tom Lane

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.
parent cdc2a704
...@@ -12,8 +12,6 @@ subdir = src/backend/replication/pgoutput ...@@ -12,8 +12,6 @@ subdir = src/backend/replication/pgoutput
top_builddir = ../../../.. top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS = pgoutput.o $(WIN32RES) OBJS = pgoutput.o $(WIN32RES)
PGFILEDESC = "pgoutput - standard logical replication output plugin" PGFILEDESC = "pgoutput - standard logical replication output plugin"
NAME = pgoutput NAME = pgoutput
......
...@@ -16,13 +16,15 @@ CFLAGS_SL = ...@@ -16,13 +16,15 @@ CFLAGS_SL =
ifneq (,$(findstring backend,$(subdir))) ifneq (,$(findstring backend,$(subdir)))
ifeq (,$(findstring conversion_procs,$(subdir))) ifeq (,$(findstring conversion_procs,$(subdir)))
ifeq (,$(findstring snowball,$(subdir)))
ifeq (,$(findstring libpqwalreceiver,$(subdir))) ifeq (,$(findstring libpqwalreceiver,$(subdir)))
ifeq (,$(findstring replication/pgoutput,$(subdir)))
ifeq (,$(findstring snowball,$(subdir)))
override CPPFLAGS+= -DBUILDING_DLL override CPPFLAGS+= -DBUILDING_DLL
endif endif
endif endif
endif endif
endif endif
endif
ifneq (,$(findstring src/common,$(subdir))) ifneq (,$(findstring src/common,$(subdir)))
override CPPFLAGS+= -DBUILDING_DLL override CPPFLAGS+= -DBUILDING_DLL
......
...@@ -14,13 +14,15 @@ CFLAGS_SL = ...@@ -14,13 +14,15 @@ CFLAGS_SL =
ifneq (,$(findstring backend,$(subdir))) ifneq (,$(findstring backend,$(subdir)))
ifeq (,$(findstring conversion_procs,$(subdir))) ifeq (,$(findstring conversion_procs,$(subdir)))
ifeq (,$(findstring snowball,$(subdir)))
ifeq (,$(findstring libpqwalreceiver,$(subdir))) ifeq (,$(findstring libpqwalreceiver,$(subdir)))
ifeq (,$(findstring replication/pgoutput,$(subdir)))
ifeq (,$(findstring snowball,$(subdir)))
override CPPFLAGS+= -DBUILDING_DLL override CPPFLAGS+= -DBUILDING_DLL
endif endif
endif endif
endif endif
endif endif
endif
ifneq (,$(findstring src/common,$(subdir))) ifneq (,$(findstring src/common,$(subdir)))
override CPPFLAGS+= -DBUILDING_DLL override CPPFLAGS+= -DBUILDING_DLL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment