X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=f330340b33728653b1c4d707f3920c047adf2716;hb=46b28f7bfdd535e9fe5217a1151bedfb2cc15472;hp=e4860ea2fa65c071bed5dccf36ee4e0bc536b694;hpb=ee58865d978747ab8d61ce041806f3223b56ef94;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index e4860ea..f330340 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -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,7 +712,7 @@ 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 $@