X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4b8417ac9527a46df3257ba3c581aff2ee610d97;hb=b84ba676034763b3082bbd9405794a4fde499d14;hp=7acb3a2e72c084adae94831391bb4c3c191017d3;hpb=e51cdf9b6e54fb4052e46b6d7afb15e062928467;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7acb3a2..4b8417a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -153,7 +153,7 @@ GhcWithSMP=$(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised)),
 # Whether to include GHCi in the compiler.  Depends on whether the RTS linker
 # has support for this OS/ARCH combination.
 
-OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd netbsd openbsd darwin)))
+OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin)))
 ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc sparc64)))
 
 ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
@@ -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
 #
@@ -411,7 +409,6 @@ GHC_GENPRIMOP_PGM       = genprimopcode$(exeext)
 GHC_GENAPPLY_PGM        = genapply$(exeext)
 GHC_CABAL_PGM           = ghc-cabal$(exeext)
 GHC_PKG_PGM             = ghc-pkg$(exeext)
-GHC_MKDEPENDC_PGM       = mkdependC
 GHC_LTX_PGM             = ltx$(exeext)
 GHC_MKDIRHIER_PGM       = mkdirhier
 GHC_LNDIR_PGM           = lndir
@@ -435,7 +432,6 @@ LNDIR			= $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
 UNLIT			= $(INPLACE_LIB)/$(GHC_UNLIT_PGM)
 TOUCHY                  = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM)
 MKDIRHIER		= $(INPLACE_BIN)/$(GHC_MKDIRHIER_PGM)
-MKDEPENDC 		= $(INPLACE_BIN)/$(GHC_MKDEPENDC_PGM)
 GHC_CABAL_INPLACE	= $(INPLACE_BIN)/$(GHC_CABAL_PGM)
 GENAPPLY_INPLACE	= $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM)
 GHC_PKG_INPLACE		= $(INPLACE_BIN)/$(GHC_PKG_PGM)
@@ -552,6 +548,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
 # Mingwex Library
 #
 HaveLibMingwEx	= @HaveLibMingwEx@
+DLLTOOL			= inplace/mingw/bin/dlltool.exe
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -565,12 +562,15 @@ 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
 
 CONTEXT_DIFF		= @ContextDiffCmd@
 CP			= cp
+# It's not easy to separate the CPP program from its flags, as
+# AC_PROG_CPP defines CPP as "/usr/bin/gcc -E"
 CPP			= @CPP@ @CPPFLAGS@
 CTAGS 			= $(ETAGS)
 #
@@ -603,6 +603,9 @@ RANLIB			= @RANLIB@
 SED			= @SedCmd@
 SHELL			= /bin/sh
 
+HaveDtrace		= @HaveDtrace@
+DTRACE			= @DtraceCmd@
+
 LD = @LdCmd@
 NM = @NmCmd@
 
@@ -619,10 +622,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
 
 #
@@ -785,12 +787,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)