2 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f718e40d..5a6e9111 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CFLAGS := -iquote $(conf_dir) $(if $(top_srcdir),-iquote $(top_srcdir)) \
           $(LANG_FLAGS) $(DIAG_FLAGS) \
           $(DBG_FLAGS) $(PLATFORM_CFLAGS) $(EXTRA_FLAGS)
 CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS))
-LDFLAGS := -lm $(PLATFORM_LDFLAGS)
+LDFLAGS := -lm $(CONF_LDFLAGS) $(PLATFORM_LDFLAGS)
 
 ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC)))
 CFLAGS := $(filter-out -Wmissing-prototypes -Wstrict-prototypes,$(CFLAGS))
diff --git a/configure b/configure
index 682b69ac..bd1eee31 100755
--- a/configure
+++ b/configure
@@ -105,6 +105,7 @@ inline=
 platform_cflags=
 remove_flags=
 lex_dbg_flags=
+conf_ldflags=
 platform_ldflags=
 txr_dbg_opts=--gc-debug
 valgrind=
@@ -685,6 +686,7 @@ BUILD_TARGETS := $(if [ $debug_also ] ; then
                      echo '$(PROG)'; fi)
 PLATFORM_CFLAGS := $platform_cflags
 PLATFORM_LDFLAGS := $platform_ldflags
+CONF_LDFLAGS := $conf_ldflags
 REMOVE_FLAGS := $remove_flags
 LEX_DBG_FLAGS := $lex_dbg_flags
 TXR_DBG_OPTS := $txr_dbg_opts
@@ -2321,6 +2323,20 @@ else
 fi
 
 #
+# Low stack size on Windows fails the man or boy test case.
+#
+
+printf "Do we need to set stack size ... "
+
+if uname -a | grep -q -E 'MINGW|CYGWIN' ; then
+  conf_ldflags='-Wl,--stack,16777216'
+  printf "yes\n"
+else
+  printf "no\n"
+fi
+
+
+#
 # Dependent variables
 #