Get rid of GHC_PACKAGE_DB_FLAG
authorJohn Ericson <git@JohnEricson.me>
Sun, 6 Oct 2019 16:35:24 +0000 (12:35 -0400)
committerMarge Bot <ben+marge-bot@smart-cactus.org>
Mon, 7 Oct 2019 16:07:08 +0000 (12:07 -0400)
We no longer support booting from older GHC since
527bcc41630918977c73584d99125ff164400695.

configure.ac
mk/config.mk.in
rules/package-config.mk
utils/ghc-cabal/ghc.mk

index 0a543c7..1ce075f 100644 (file)
@@ -166,9 +166,6 @@ then
     fi
 fi
 
-GHC_PACKAGE_DB_FLAG=package-db
-AC_SUBST(GHC_PACKAGE_DB_FLAG)
-
 # GHC is passed to Cabal, so we need a native path
 if test "${WithGhc}" != ""
 then
index f9dbf4b..a946b17 100644 (file)
@@ -474,8 +474,6 @@ else
 GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
 endif
 
-GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
-
 #-----------------------------------------------------------------------------
 # Settings
 
index 4d9737f..8605407 100644 (file)
@@ -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 = 
index 02e8ccd..c921f32 100644 (file)
@@ -62,7 +62,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP
               -hide-all-packages \
               $(addprefix -package , $(CABAL_BUILD_DEPS)) \
               --make utils/ghc-cabal/Main.hs -o $@ \
-              -no-user-$(GHC_PACKAGE_DB_FLAG) \
+              -no-user-package-db \
               -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
               -DCABAL_VERSION=$(CABAL_VERSION) \
               -DCABAL_PARSEC \