diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 674302feb7..2320319c4e 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -14,8 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
 
-ifneq (,$(filter $(PORTNAME),cygwin win32))
-override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
-endif
-
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
index 3aaa8a9f04..f274d802b1 100644
--- a/src/makefiles/Makefile.cygwin
+++ b/src/makefiles/Makefile.cygwin
@@ -14,6 +14,8 @@ AROPT = crs
 DLSUFFIX = .dll
 CFLAGS_SL =
 
+override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
+
 ifneq (,$(findstring backend,$(subdir)))
 ifeq (,$(findstring conversion_procs,$(subdir)))
 ifeq (,$(findstring libpqwalreceiver,$(subdir)))
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 7abbd01971..3dea11e5c2 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -8,6 +8,8 @@ BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
 endif
 
+override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
+
 AROPT = crs
 DLSUFFIX = .dll
 CFLAGS_SL =