diff options
| author | Esa Ilari Vuokko <ei@vuokko.info> | 2007-08-21 21:04:59 +0000 |
|---|---|---|
| committer | Esa Ilari Vuokko <ei@vuokko.info> | 2007-08-21 21:04:59 +0000 |
| commit | a5c802d4a27be911b6cbc23104bcff753867b55a (patch) | |
| tree | e6f302c2fb8fbdacce422e8e6b9c890b60029837 | |
| parent | 67760c45fc0b18bdd21d31b0462f4ad7ee4d2c4c (diff) | |
| download | haskell-a5c802d4a27be911b6cbc23104bcff753867b55a.tar.gz | |
Link ghc-pkg and hpc with containers if building ghc 6.7 or newer
| -rw-r--r-- | utils/ghc-pkg/Makefile | 4 | ||||
| -rw-r--r-- | utils/hpc/Makefile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 698cdc11de..0238334bfe 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 affa2401c8..17065fa081 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/ |