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

Commit 0502e85

Browse files
committed
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.
1 parent cdc2a70 commit 0502e85

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/backend/replication/pgoutput/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ subdir = src/backend/replication/pgoutput
1212
top_builddir = ../../../..
1313
include $(top_builddir)/src/Makefile.global
1414

15-
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
16-
1715
OBJS = pgoutput.o $(WIN32RES)
1816
PGFILEDESC = "pgoutput - standard logical replication output plugin"
1917
NAME = pgoutput

src/makefiles/Makefile.cygwin

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ CFLAGS_SL =
1616

1717
ifneq (,$(findstring backend,$(subdir)))
1818
ifeq (,$(findstring conversion_procs,$(subdir)))
19-
ifeq (,$(findstring snowball,$(subdir)))
2019
ifeq (,$(findstring libpqwalreceiver,$(subdir)))
20+
ifeq (,$(findstring replication/pgoutput,$(subdir)))
21+
ifeq (,$(findstring snowball,$(subdir)))
2122
override CPPFLAGS+= -DBUILDING_DLL
2223
endif
2324
endif
2425
endif
2526
endif
27+
endif
2628

2729
ifneq (,$(findstring src/common,$(subdir)))
2830
override CPPFLAGS+= -DBUILDING_DLL

src/makefiles/Makefile.win32

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ CFLAGS_SL =
1414

1515
ifneq (,$(findstring backend,$(subdir)))
1616
ifeq (,$(findstring conversion_procs,$(subdir)))
17-
ifeq (,$(findstring snowball,$(subdir)))
1817
ifeq (,$(findstring libpqwalreceiver,$(subdir)))
18+
ifeq (,$(findstring replication/pgoutput,$(subdir)))
19+
ifeq (,$(findstring snowball,$(subdir)))
1920
override CPPFLAGS+= -DBUILDING_DLL
2021
endif
2122
endif
2223
endif
2324
endif
25+
endif
2426

2527
ifneq (,$(findstring src/common,$(subdir)))
2628
override CPPFLAGS+= -DBUILDING_DLL

0 commit comments

Comments
 (0)