diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | rules/package-config.mk | 6 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 0a543c76cf..1ce075fe55 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/mk/config.mk.in b/mk/config.mk.in index f9dbf4bc5a..a946b17bf9 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -474,8 +474,6 @@ else GhcCanonVersion = $(GhcMajVersion)$(GhcMinVersion) endif -GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@ - #----------------------------------------------------------------------------- # Settings 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 = diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 02e8ccd71a..c921f329cb 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -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 \ |