From ca2debb201bf44b518bc06a8d37ca1017ccf390f Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Fri, 4 May 2012 13:04:43 +0100 Subject: 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. --- ghc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ghc.mk') 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)" \ -- cgit v1.2.1