Link ghc-pkg and hpc with containers if building ghc 6.7 or newer

utils/ghc-pkg/Makefile

@@ -16,6 +16,10 @@ SRC_HC_OPTS += $(PACKAGE_CABAL)
 # we must also build with $(GhcHcOpts) here:
 SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
 
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package containers
+endif
+
 # On Windows, ghc-pkg is a standalone program
 # ($bindir/ghc-pkg.exe), whereas on Unix it needs a wrapper script
 # to pass the appropriate flag to the real binary

utils/hpc/Makefile

@@ -8,6 +8,10 @@ HPC_LIB         = $(TOP)/libraries/hpc
 include $(GHC_COMPAT_DIR)/compat.mk
 SRC_HC_OPTS += $(PACKAGE_HPC) -cpp 
 
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package containers
+endif
+
 binary-dist:
 	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hpc
 	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/hpc/