Reduce the xargs -s value we use on Windows

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2daf623..290db85 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,10 +97,11 @@ GhcStage1HcOpts=
 GhcStage2HcOpts=-O2
 GhcStage3HcOpts=-O2
 
-GhcProfiled=NO
 GhcDebugged=NO
 GhcDynamic=NO
-GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
+
+# GhcProfiled=YES means compile a profiled stage-2 compiler
+GhcProfiled=NO
 
 # Do we support shared libs?
 PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin powerpc-apple-darwin),YES,NO)
@@ -626,10 +627,12 @@ LdIsGNULd         = @LdIsGNULd@
 # On MSYS, building with SplitObjs=YES fails with 
 #   ar: Bad file number
 # see #3201.  We need to specify a smaller max command-line size
-# to work around it.  32767 doesn't work; 30000 does.
+# to work around it.  32767 doesn't work; 30000 does, but says
+#     xargs: value for -s option should be < 28153
+# so we now use 20000 to be comfortably below this bound
 XARGS = xargs
 ifeq "$(Windows)" "YES"
-XARGS_OPTS = -s 30000
+XARGS_OPTS = -s 20000
 endif
 
 #
@@ -725,9 +728,9 @@ SRC_ALEX_OPTS               = -g
 HSTAGS = @HstagsCmd@
 
 # Should we build haddock docs?
-HADDOCK_DOCS = $(GhcWithInterpreter)
+HADDOCK_DOCS = YES
 # And HsColour the sources?
-ifeq "$(HSCOLOUR)" ""
+ifeq "$(HSCOLOUR_CMD)" ""
 HSCOLOUR_SRCS = NO
 else
 HSCOLOUR_SRCS = YES