Commit f659a182 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Build ghc-pwd.

parent a0e932ab
module GHC ( module GHC (
array, base, binPackageDb, binary, bytestring, cabal, compiler, containers, array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, haskeline, deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd,
hoopl, hpc, integerGmp, integerSimple, parallel, pretty, primitive, process, haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty,
stm, templateHaskell, terminfo, time, transformers, unix, win32, xhtml, primitive, process, stm, templateHaskell, terminfo, time, transformers,
unix, win32, xhtml,
defaultKnownPackages, defaultTargetDirectory, defaultProgramPath defaultKnownPackages, defaultTargetDirectory, defaultProgramPath
) where ) where
...@@ -20,15 +21,16 @@ defaultKnownPackages :: [Package] ...@@ -20,15 +21,16 @@ defaultKnownPackages :: [Package]
defaultKnownPackages = defaultKnownPackages =
[ array, base, binPackageDb, binary, bytestring, cabal, compiler [ array, base, binPackageDb, binary, bytestring, cabal, compiler
, containers, deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim , 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 , primitive, process, stm, templateHaskell, terminfo, time, transformers
, unix, win32, xhtml ] , unix, win32, xhtml ]
-- Package definitions -- Package definitions
array, base, binPackageDb, binary, bytestring, cabal, compiler, containers, array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, haskeline, deepseq, directory, filepath, ghc, ghcCabal, ghcPkg, ghcPrim, ghcPwd,
hoopl, hpc, integerGmp, integerSimple, parallel, pretty, primitive, process, haskeline, hoopl, hpc, integerGmp, integerSimple, parallel, pretty,
stm, templateHaskell, terminfo, time, transformers, unix, win32, xhtml :: Package primitive, process, stm, templateHaskell, terminfo, time, transformers,
unix, win32, xhtml :: Package
array = library "array" array = library "array"
base = library "base" base = library "base"
...@@ -45,6 +47,7 @@ ghc = topLevel "ghc-bin" `setPath` "ghc" ...@@ -45,6 +47,7 @@ ghc = topLevel "ghc-bin" `setPath` "ghc"
ghcCabal = utility "ghc-cabal" ghcCabal = utility "ghc-cabal"
ghcPkg = utility "ghc-pkg" ghcPkg = utility "ghc-pkg"
ghcPrim = library "ghc-prim" ghcPrim = library "ghc-prim"
ghcPwd = utility "ghc-pwd"
haskeline = library "haskeline" haskeline = library "haskeline"
hoopl = library "hoopl" hoopl = library "hoopl"
hpc = library "hpc" hpc = library "hpc"
...@@ -84,6 +87,7 @@ defaultProgramPath stage pkg ...@@ -84,6 +87,7 @@ defaultProgramPath stage pkg
| pkg == ghc = program $ "ghc-stage" ++ show (fromEnum stage + 1) | pkg == ghc = program $ "ghc-stage" ++ show (fromEnum stage + 1)
| pkg == ghcCabal = program $ pkgName pkg | pkg == ghcCabal = program $ pkgName pkg
| pkg == ghcPkg = program $ pkgName pkg | pkg == ghcPkg = program $ pkgName pkg
| pkg == ghcPwd = program $ pkgName pkg
| otherwise = Nothing | otherwise = Nothing
where where
program name = Just $ pkgPath pkg -/- defaultTargetDirectory stage pkg program name = Just $ pkgPath pkg -/- defaultTargetDirectory stage pkg
......
...@@ -17,7 +17,7 @@ defaultPackages = mconcat ...@@ -17,7 +17,7 @@ defaultPackages = mconcat
packagesStage0 :: Packages packagesStage0 :: Packages
packagesStage0 = mconcat packagesStage0 = mconcat
[ append [ binPackageDb, binary, cabal, compiler, ghc, ghcCabal, ghcPkg [ append [ binPackageDb, binary, cabal, compiler, ghc, ghcCabal, ghcPkg
, hoopl, hpc, templateHaskell, transformers ] , ghcPwd, hoopl, hpc, templateHaskell, transformers ]
, notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ] , notM windowsHost ? notM (anyHostOs ["ios"]) ? append [terminfo] ]
-- TODO: what do we do with parallel, stm, random, primitive, vector and dph? -- TODO: what do we do with parallel, stm, random, primitive, vector and dph?
...@@ -25,8 +25,8 @@ packagesStage1 :: Packages ...@@ -25,8 +25,8 @@ packagesStage1 :: Packages
packagesStage1 = mconcat packagesStage1 = mconcat
[ packagesStage0 [ packagesStage0
, append [ array, base, bytestring, containers, deepseq, directory, filepath , append [ array, base, bytestring, containers, deepseq, directory, filepath
, ghcCabal, ghcPkg, ghcPrim, haskeline, integerLibrary, pretty , ghcCabal, ghcPkg, ghcPrim, ghcPwd, haskeline, integerLibrary
, process, time ] , pretty, process, time ]
, windowsHost ? append [win32] , windowsHost ? append [win32]
, notM windowsHost ? append [unix] , notM windowsHost ? append [unix]
, buildHaddock ? append [xhtml] ] , buildHaddock ? append [xhtml] ]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment