ghc-cabal now adds the language flag being used

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7acf824..c4a0229 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -434,7 +434,6 @@ GHC_PKG_PGM             = ghc-pkg$(exeext)
 GHC_LTX_PGM             = ltx$(exeext)
 GHC_MKDIRHIER_PGM       = mkdirhier
 GHC_LNDIR_PGM           = lndir
-GHC_DUMMY_GHC_PGM       = dummy-ghc$(exeext)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 GHC_CP                 = "xcopy /y"
@@ -460,7 +459,6 @@ GHC_PKG_INPLACE             = $(INPLACE_BIN)/$(GHC_PKG_PGM)
 GHCTAGS_INPLACE                = $(INPLACE_BIN)/$(GHC_GHCTAGS_PGM)
 HSC2HS_INPLACE         = $(INPLACE_BIN)/$(GHC_HSC2HS_PGM)
 GENPRIMOP_INPLACE      = $(INPLACE_BIN)/$(GHC_GENPRIMOP_PGM)
-DUMMY_GHC_INPLACE      = $(INPLACE_BIN)/$(GHC_DUMMY_GHC_PGM)
 
 GENERATED_FILE  = chmod a-w
 EXECUTABLE_FILE = chmod +x
@@ -621,6 +619,9 @@ TR                  = tr
 SHELL                  = /bin/sh
 
 HaveDtrace             = @HaveDtrace@
+# There are problems with dtrace on 64bit 10.5. For now at least, we
+# just turn dtrace off unless you override USE_DTRACE
+USE_DTRACE = NO
 DTRACE                 = @DtraceCmd@
 
 LD = @LdCmd@
@@ -722,10 +723,6 @@ HAPPY_VERSION              = @HappyVersion@
 #
 SRC_HAPPY_OPTS         = -agc --strict
 
-# Temp. to work around performance problems in the HEAD around 8/12/2003,
-# A Happy compiled with this compiler needs more stack.
-SRC_HAPPY_OPTS         += +RTS -K2m -RTS
-
 #
 # Alex
 #