From ba3fb5d4fb9227719759740b6d7771e719c3318b Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Tue, 9 Apr 2019 08:25:39 -0700 Subject: [PATCH] Define WIN32_STACK_RLIMIT throughout win32 and cygwin builds. The MSVC build system already did this, and commit 617dc6d299c957e2784320382b3277ede01d9c63 used it in a second file. Back-patch to 9.4, like that commit. Discussion: https://postgr.es/m/CAA8=A7_1SWc3+3Z=-utQrQFOtrj_DeohRVt7diA2tZozxsyUOQ@mail.gmail.com --- src/backend/tcop/Makefile | 4 ---- src/makefiles/Makefile.cygwin | 2 ++ src/makefiles/Makefile.win32 | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 674302feb79..2320319c4ef 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 3aaa8a9f04b..f274d802b1e 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 7abbd01971a..3dea11e5c28 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 =