diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 674302feb79aa2f4dddc787cb6ccf75492584892..2320319c4ef6f5e0dd9a29c1ff3269730bc3cc4b 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 bb2efed3ce5b788ccf56c9004bba7727843bdb59..2d57b4b0891cf1ff0db7ce52dd7f78bf5bfabac9 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 snowball,$(subdir)))
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 354014a0c875acc399e0f09f45c0e08f7b1f7700..3c8024a715fa76a31d4094dd3db2345ec4b1d6d1 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -9,6 +9,8 @@ else
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
 endif
 
+override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
+
 AROPT = crs
 DLSUFFIX = .dll
 CFLAGS_SL =