summaryrefslogtreecommitdiff
path: root/ghc.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 /ghc.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 'ghc.mk')
-rw-r--r--ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index 195310bef6..a23171caa7 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -899,7 +899,7 @@ install_packages: rts/package.conf.install
$(call INSTALL_DIR,"$(DESTDIR)$(topdir)")
$(call removeTrees,"$(INSTALLED_PACKAGE_CONF)")
$(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)")
- "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
+ "$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
$(foreach p, $(INSTALLED_PKG_DIRS), \
$(call make-command, \
CROSS_COMPILE="$(CrossCompilePrefix)" \