Commit 4df39fd0 authored by John Ericson's avatar John Ericson Committed by Marge Bot

Get rid of GHC_PACKAGE_DB_FLAG

We no longer support booting from older GHC since
527bcc41.
parent 9a6bfb0a
Pipeline #11049 passed with stages
in 380 minutes and 30 seconds
......@@ -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
......
......@@ -474,8 +474,6 @@ else
GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion)
endif
GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
#-----------------------------------------------------------------------------
# Settings
......
......@@ -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 =
......
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment