From a5c802d4a27be911b6cbc23104bcff753867b55a Mon Sep 17 00:00:00 2001 From: Esa Ilari Vuokko Date: Tue, 21 Aug 2007 21:04:59 +0000 Subject: [PATCH] Link ghc-pkg and hpc with containers if building ghc 6.7 or newer --- utils/ghc-pkg/Makefile | 4 ++++ utils/hpc/Makefile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 698cdc1..0238334 100644 --- a/utils/ghc-pkg/Makefile +++ b/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 diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile index affa240..17065fa 100644 --- a/utils/hpc/Makefile +++ b/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/ -- 1.7.10.4