summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorPaolo Capriotti <p.capriotti@gmail.com>2012-05-04 13:04:43 +0100
committerPaolo Capriotti <p.capriotti@gmail.com>2012-05-15 08:22:42 +0100
commitca2debb201bf44b518bc06a8d37ca1017ccf390f (patch)
tree95a367120912de4bced45658320d79289fd70a49 /mk
parent6a831be4aa73e86568256813ffa862d7cfd5732d (diff)
downloadhaskell-ca2debb201bf44b518bc06a8d37ca1017ccf390f.tar.gz
Rename package-conf flags to package-db.
Rename package database flags in both GHC and ghc-pkg so that they are consistent with Cabal nomenclature. Add a version check to the build system so that the correct set of package db flags are used when the bootstrapping GHC has version < 7.5.
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index b998946239..1cf8685383 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -543,6 +543,8 @@ compiler/cmm/Bitmap_HC_OPTS += -ffull-laziness
# for some unknown reason, so turn full-laziness back on for this module.
endif
+GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
+
#-----------------------------------------------------------------------------
# C compiler
#