[commit: ghc] wip/nfs-locking: Build ghc-pkg and ghc-cabal in stage 0. (a0e932a)

[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/a0e932ab5e73ccf062cacea3f6e8b15ca3d15463/ghc

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

commit a0e932ab5e73ccf062cacea3f6e8b15ca3d15463
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Dec 12 00:50:27 2015 +0000

    Build ghc-pkg and ghc-cabal in stage 0.


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

a0e932ab5e73ccf062cacea3f6e8b15ca3d15463
 src/GHC.hs               | 2 ++
 src/Settings/Packages.hs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index eff2334..2482854 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -70,6 +70,8 @@ xhtml           = library  "xhtml"
 -- * doc/            : produced by haddock
 -- * package-data.mk : contains output of ghc-cabal applied to pkgCabal
 -- TODO: simplify to just 'show stage'?
+-- TODO: we divert from the previous convention for ghc-cabal and ghc-pkg,
+-- which used to store stage0 build results in 'dist' folder
 defaultTargetDirectory :: Stage -> Package -> FilePath
 defaultTargetDirectory stage pkg
     | pkg   == compiler = "stage" ++ show (fromEnum stage + 1)
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 9fbe936..23ee7e4 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -16,8 +16,8 @@ defaultPackages = mconcat
 
 packagesStage0 :: Packages
 packagesStage0 = mconcat
-    [ append [ binPackageDb, binary, cabal, compiler, ghc, hoopl, hpc
-             , templateHaskell, transformers ]
+    [ append [ binPackageDb, binary, cabal, compiler, ghc, ghcCabal, ghcPkg
+             , hoopl, hpc, templateHaskell, transformers ]
     , notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ]
 
 -- TODO: what do we do with parallel, stm, random, primitive, vector and dph?