X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhpc%2FMakefile;h=17065fa08156ec2ddfefd785e3bf0c471226d599;hb=a2dd573dca7d1cf150e900a7ea6e03d734bee96b;hp=46fd6937437f54b907653d7cc0583b28f97f7056;hpb=9fde8e7e6e08680f2c6addc5f1ed2232db71b604;p=ghc-hetmet.git

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index 46fd693..17065fa 100644
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -5,13 +5,12 @@ HS_PROG		= hpc$(exeext)
 INSTALL_PROGS  += $(HS_PROG)
 HPC_LIB         = $(TOP)/libraries/hpc
 
-# This causes libghccompat.a to be used:
 include $(GHC_COMPAT_DIR)/compat.mk
+SRC_HC_OPTS += $(PACKAGE_HPC) -cpp 
 
-# This is required because libghccompat.a must be built with
-# $(GhcHcOpts) because it is linked to the compiler, and hence
-# we must also build with $(GhcHcOpts) here:
-SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package containers
+endif
 
 binary-dist:
 	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hpc