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 /utils/ghc-cabal | |
| 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 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index c24f127422..0f11eea497 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -190,7 +190,7 @@ doInstall ghc ghcpkg strip topdir directory distDir programPostConf = \_ _ -> return ["-B" ++ topdir], programFindLocation = \_ -> return (Just ghc) } ghcPkgProgram' = ghcPkgProgram { - programPostConf = \_ _ -> return $ ["--global-conf", ghcpkgconf] + programPostConf = \_ _ -> return $ ["--global-package-db", ghcpkgconf] ++ ["--force" | not (null myDestDir) ], programFindLocation = \_ -> return (Just ghcpkg) } stripProgram' = stripProgram { diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 3ee2b13fa5..0a3e920e7a 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -27,7 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/C $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/. "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \ - -no-user-package-conf \ + -no-user-$(GHC_PACKAGE_DB_FLAG) \ -Wall \ -DCABAL_VERSION=$(CABAL_VERSION) \ -odir bootstrapping \ |