summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-10-06 12:35:24 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-07 12:07:08 -0400
commit4df39fd071aa5b6863818212df116547201cd29c (patch)
tree5e27be6b483369bc4602afd6d4ed8ec4a3b3172a /rules
parent9a6bfb0a0b4c3a29652df1320c30035e1347949d (diff)
downloadhaskell-4df39fd071aa5b6863818212df116547201cd29c.tar.gz
Get rid of GHC_PACKAGE_DB_FLAG
We no longer support booting from older GHC since 527bcc41630918977c73584d99125ff164400695.
Diffstat (limited to 'rules')
-rw-r--r--rules/package-config.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/package-config.mk b/rules/package-config.mk
index 4d9737f05d..86054071ad 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 = -$(GHC_PACKAGE_DB_FLAG) $$(BOOTSTRAPPING_CONF)
-$1_$2_GHC_PKG_OPTS = --$(GHC_PACKAGE_DB_FLAG)=$$(BOOTSTRAPPING_CONF)
+$1_$2_HC_PKGCONF = -package-db $$(BOOTSTRAPPING_CONF)
+$1_$2_GHC_PKG_OPTS = --package-db=$$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
-$1_$2_MORE_HC_OPTS += -no-user-$(GHC_PACKAGE_DB_FLAG)
+$1_$2_MORE_HC_OPTS += -no-user-package-db
$1_$2_MORE_HC_OPTS += -rtsopts
else
$1_$2_HC_PKGCONF =