build ghctags-inplace

[ghc-hetmet.git] / utils / hpc / Makefile

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index 46fd693..17065fa 100644 (file)
--- 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