[commit: ghc] wip/nfs-locking: Build ghc-pwd. (f659a18)

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

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

commit f659a18291a9e4f1a8b8d7f2e22744923effcac0
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Dec 12 00:53:49 2015 +0000

    Build ghc-pwd.


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

f659a18291a9e4f1a8b8d7f2e22744923effcac0
 src/GHC.hs               | 18 +++++++++++-------
 src/Settings/Packages.hs |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index 2482854..d1fb30a 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -1,8 +1,9 @@
 module GHC (
     array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
-    deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, haskeline,
-    hoopl, hpc, integerGmp, integerSimple, parallel, pretty, primitive, process,
-    stm, templateHaskell, terminfo, time, transformers, unix, win32, xhtml,
+    deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd,
+    haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty,
+    primitive, process, stm, templateHaskell, terminfo, time, transformers,
+    unix, win32, xhtml,
 
     defaultKnownPackages, defaultTargetDirectory, defaultProgramPath
     ) where
@@ -20,15 +21,16 @@ defaultKnownPackages :: [Package]
 defaultKnownPackages =
     [ array, base, binPackageDb, binary, bytestring, cabal, compiler
     , containers, deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim
-    , haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty
+    , ghcPwd, haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty
     , primitive, process, stm, templateHaskell, terminfo, time, transformers
     , unix, win32, xhtml ]
 
 -- Package definitions
 array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
-    deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, haskeline,
-    hoopl, hpc, integerGmp, integerSimple, parallel, pretty, primitive, process,
-    stm, templateHaskell, terminfo, time, transformers, unix, win32, xhtml :: Package
+    deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd,
+    haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty,
+    primitive, process, stm, templateHaskell, terminfo, time, transformers,
+    unix, win32, xhtml :: Package
 
 array           = library  "array"
 base            = library  "base"
@@ -45,6 +47,7 @@ ghc             = topLevel "ghc-bin"        `setPath` "ghc"
 ghcCabal        = utility  "ghc-cabal"
 ghcPkg          = utility  "ghc-pkg"
 ghcPrim         = library  "ghc-prim"
+ghcPwd          = utility  "ghc-pwd"
 haskeline       = library  "haskeline"
 hoopl           = library  "hoopl"
 hpc             = library  "hpc"
@@ -84,6 +87,7 @@ defaultProgramPath stage pkg
     | pkg == ghc      = program $ "ghc-stage" ++ show (fromEnum stage + 1)
     | pkg == ghcCabal = program $ pkgName pkg
     | pkg == ghcPkg   = program $ pkgName pkg
+    | pkg == ghcPwd   = program $ pkgName pkg
     | otherwise       = Nothing
   where
     program name = Just $ pkgPath pkg -/- defaultTargetDirectory stage pkg
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 23ee7e4..b2636d5 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -17,7 +17,7 @@ defaultPackages = mconcat
 packagesStage0 :: Packages
 packagesStage0 = mconcat
     [ append [ binPackageDb, binary, cabal, compiler, ghc, ghcCabal, ghcPkg
-             , hoopl, hpc, templateHaskell, transformers ]
+             , ghcPwd, hoopl, hpc, templateHaskell, transformers ]
     , notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ]
 
 -- TODO: what do we do with parallel, stm, random, primitive, vector and dph?
@@ -25,8 +25,8 @@ packagesStage1 :: Packages
 packagesStage1 = mconcat
     [ packagesStage0
     , append [ array, base, bytestring, containers, deepseq, directory, filepath
-             , ghcCabal, ghcPkg, ghcPrim, haskeline, integerLibrary, pretty
-             , process, time ]
+             , ghcCabal, ghcPkg, ghcPrim, ghcPwd, haskeline, integerLibrary
+             , pretty, process, time ]
     , windowsHost      ? append [win32]
     , notM windowsHost ? append [unix]
     , buildHaddock     ? append [xhtml] ]