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

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

parent bbc6e4a2
......@@ -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)
......
......@@ -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?
......
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