Split XARGS into XARGS and XARGS_OPTS

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 32fb196..ee53a5a 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -235,8 +235,6 @@ BuildSharedLibs=$(strip $(if $(findstring dyn,$(GhcLibWays)),YES,NO))
 #   debug_p     : debugging profiled
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
-#   t          : ticky-ticky profiling
-#   debug_t    : debugging ticky-ticky profiling
 #   l           : event logging
 #   thr_l       : threaded and event logging
 #
@@ -272,9 +270,6 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 
 GhcLibHcOpts=-O2 -XGenerics
 
-# Win32 only: Enable the RTS and libraries to be built as DLLs
-DLLized=@EnableWin32DLLs@
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -361,12 +356,12 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR         = /C/TEMP
 endif
 
-BIN_DIST_DIR=bindistprep/$(BIN_DIST_NAME)
-
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TAR=$(TOP)/bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
-BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2
-BIN_DIST_LIST=$(TOP)/bindist-list
+BIN_DIST_NAME         = ghc-$(ProjectVersion)
+BIN_DIST_PREP_DIR     = bindistprep/$(BIN_DIST_NAME)
+BIN_DIST_PREP_TAR     = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
+BIN_DIST_PREP_TAR_BZ2 = $(BIN_DIST_PREP_TAR).bz2
+BIN_DIST_TAR_BZ2      = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
+BIN_DIST_LIST         = bindist-list
 
 WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-i386-windows
 WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
@@ -568,6 +563,7 @@ HaveLibMingwEx      = @HaveLibMingwEx@
 # Other standard (ha!) Unix utilities
 
 AR                     = @ArCmd@
+AR_OPTS                        = @ArArgs@
 ArSupportsInput                = @ArSupportsInput@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
@@ -606,7 +602,8 @@ RANLIB                      = @RANLIB@
 SED                    = @SedCmd@
 SHELL                  = /bin/sh
 
-LD                     = @LdCmd@
+LD = @LdCmd@
+NM = @NmCmd@
 
 # Some ld's support the -x flag and some don't, so the configure
 # script detects which we have and sets LdXFlag to "-x" or ""
@@ -621,10 +618,9 @@ LdIsGNULd          = @LdIsGNULd@
 #   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.
-ifeq "$(Windows)" "YES"
-XARGS = xargs -s 30000
-else
 XARGS = xargs
+ifeq "$(Windows)" "YES"
+XARGS_OPTS = -s 30000
 endif
 
 #
@@ -787,12 +783,6 @@ ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
 #
 ################################################################################
 
-ifeq "$(Windows)" "YES"
 BIN_DIST_INST_SUBDIR = "install dir"
-else
-# I very much doubt that paths with spaces will work on Unix
-BIN_DIST_INST_SUBDIR = installed
-endif
-
 BIN_DIST_INST_DIR = $(TOP)/bindisttest/$(BIN_DIST_INST_SUBDIR)