diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-04 13:04:43 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-15 08:22:42 +0100 |
| commit | ca2debb201bf44b518bc06a8d37ca1017ccf390f (patch) | |
| tree | 95a367120912de4bced45658320d79289fd70a49 /rules/package-config.mk | |
| parent | 6a831be4aa73e86568256813ffa862d7cfd5732d (diff) | |
| download | haskell-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 'rules/package-config.mk')
| -rw-r--r-- | rules/package-config.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/package-config.mk b/rules/package-config.mk index e0c9757862..1173e5f025 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -34,10 +34,10 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC) # on cygwin we get a dep on c:/ghc/..., and make gets confused by the : $1_$2_HC_MK_DEPEND_DEP = $1_$2_HC_DEP = -$1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF) -$1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF) +$1_$2_HC_PKGCONF = -$(GHC_PACKAGE_DB_FLAG) $$(BOOTSTRAPPING_CONF) +$1_$2_GHC_PKG_OPTS = --$(GHC_PACKAGE_DB_FLAG)=$$(BOOTSTRAPPING_CONF) $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF) -$1_$2_MORE_HC_OPTS += -no-user-package-conf +$1_$2_MORE_HC_OPTS += -no-user-$(GHC_PACKAGE_DB_FLAG) $1_$2_MORE_HC_OPTS += -rtsopts else $1_$2_HC_PKGCONF = @@ -51,7 +51,7 @@ $1_$2_GHC_PKG_OPTS = $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1) $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND) $1_$2_HC_DEP = $$($1_$2_HC) -$1_$2_MORE_HC_OPTS += -no-user-package-conf +$1_$2_MORE_HC_OPTS += -no-user-package-db $1_$2_MORE_HC_OPTS += -rtsopts endif |