Commit a5c802d4 authored by ei@vuokko.info's avatar ei@vuokko.info
Browse files

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

parent 67760c45
......@@ -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
......
......@@ -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/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment