[commit: ghc] wip/nfs-locking: GHC: bin-package-db is now ghc-boot (73b4605)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/73b460528b96ce7c6c056d25dee9c7e50924f59c/ghc

>---------------------------------------------------------------

commit 73b460528b96ce7c6c056d25dee9c7e50924f59c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 01:32:59 2015 +0100

    GHC: bin-package-db is now ghc-boot


>---------------------------------------------------------------

73b460528b96ce7c6c056d25dee9c7e50924f59c
 src/GHC.hs               | 8 ++++----
 src/Settings/Packages.hs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index ea48014..30414db 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -1,5 +1,5 @@
 module GHC (
-    array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
+    array, base, ghcBoot, binary, bytestring, cabal, compiler, containers,
     compareSizes, deepseq, deriveConstants, directory, dllSplit, filepath,
     genapply, genprimopcode, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd, ghcTags,
     haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
@@ -20,7 +20,7 @@ import Stage
 -- which can be overridden in Settings/User.hs.
 defaultKnownPackages :: [Package]
 defaultKnownPackages =
-    [ array, base, binPackageDb, binary, bytestring, cabal, compiler
+    [ array, base, ghcBoot, binary, bytestring, cabal, compiler
     , containers, compareSizes, deepseq, deriveConstants, directory, dllSplit
     , filepath, genapply, genprimopcode, ghc, ghcCabal, ghcPkg, ghcPrim
     , ghcPwd, ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin
@@ -29,7 +29,7 @@ defaultKnownPackages =
     , win32, xhtml ]
 
 -- Package definitions (see Package.hs)
-array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
+array, base, ghcBoot, binary, bytestring, cabal, compiler, containers,
     compareSizes, deepseq, deriveConstants, directory, dllSplit, filepath,
     genapply, genprimopcode, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd,
     ghcTags, haddock, haskeline, hsc2hs, hoopl, hp2ps, hpc, hpcBin, integerGmp,
@@ -38,7 +38,7 @@ array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
 
 array           = library  "array"
 base            = library  "base"
-binPackageDb    = library  "bin-package-db"
+ghcBoot         = library  "ghc-boot"
 binary          = library  "binary"
 bytestring      = library  "bytestring"
 cabal           = library  "Cabal"          `setPath` "libraries/Cabal/Cabal"
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 80fc202..febb254 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -18,7 +18,7 @@ defaultPackages = mconcat
 
 packagesStage0 :: Packages
 packagesStage0 = mconcat
-    [ append [ binPackageDb, binary, cabal, compiler, ghc, ghcCabal, ghcPkg
+    [ append [ ghcBoot, binary, cabal, compiler, ghc, ghcCabal, ghcPkg
              , hsc2hs, hoopl, hpc, templateHaskell, transformers ]
     , stage0 ? append [deriveConstants, genapply, genprimopcode, hp2ps]
     , notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ]