Make -ddump-simpl-stats a bit more informative by default

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4431dd8..b436235 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -409,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
@@ -433,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)
@@ -550,7 +548,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d))
 # Mingwex Library
 #
 HaveLibMingwEx = @HaveLibMingwEx@
-DLLTOOL                        = @DlltoolCmd@
+DLLTOOL                        = inplace/mingw/bin/dlltool.exe
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
@@ -571,6 +569,8 @@ 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)
 #