Adding pushing of hpc translation status through hi files.

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index e4860ea..dcaf18e 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -367,7 +367,7 @@ SRC_HC_OPTS += -Istage$(stage)
 
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
-  specialise simplCore stranal stgSyn simplStg codeGen main \
+  vectorise specialise simplCore stranal stgSyn simplStg codeGen main \
   profiling parser cprAnalysis ndpFlatten iface cmm
 
 # Make sure we include Config.hs even if it doesn't exist yet...
@@ -406,15 +406,15 @@ endif
 # -----------------------------------------------------------------------------
 # Building a compiler with interpreter support
 #
-# The interpreter, GHCi interface, and Template Haskell are only
+# The interpreter, GHCi interface, Template Haskell and Hpc are only
 # enabled when we are bootstrapping with the same version of GHC, and
 # the interpreter is supported on this platform.
 
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell
-PKG_DEPENDS += template-haskell
+SRC_HC_OPTS += -DGHCI -package template-haskell -package hpc
+PKG_DEPENDS += template-haskell hpc
 
 # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
 # or not?
@@ -712,10 +712,10 @@ TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM))
 
 $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
        echo "import System.Cmd; import System.Environment; import System.Exit" > $@
-       echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@
+       echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@
 
 $(INPLACE_PROG): $(INPLACE_HS)
-       $(GHC) --make $< -o $@
+       $(HC) --make $< -o $@
 
 all :: $(INPLACE_PROG)