Commit 5c42b582 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Merge pull request #11 from bgamari/master

Fix fallout from previous refactoring
parents 821d9e9c c84445f8
......@@ -68,7 +68,7 @@ hpc = library "hpc"
hpcBin = utility "hpc-bin" `setPath` "utils/hpc"
integerGmp = library "integer-gmp"
integerSimple = library "integer-simple"
iservBin = topLevel "iserv-bin" `setPath` "iserv"
iservBin = topLevel "iserv-bin" `setPath` "iserv" `setPkgType` Program
mkUserGuidePart = utility "mkUserGuidePart"
parallel = library "parallel"
pretty = library "pretty"
......
......@@ -10,12 +10,12 @@ generateTargets :: Rules ()
generateTargets = action $ do
targets <- fmap concat . forM [Stage0 ..] $ \stage -> do
pkgs <- interpretWithStage stage getPackages
let (libPkgs, programPkgs) = partition isLibrary pkgs
let libPkgs = filter isLibrary pkgs
libTargets <- fmap concat . forM libPkgs $ \pkg -> do
let target = PartialTarget stage pkg
needHaddock <- interpretPartial target buildHaddock
return $ [ pkgHaddockFile pkg | needHaddock && stage == Stage1 ]
let programTargets = map (fromJust . programPath stage) programPkgs
return [ pkgHaddockFile pkg | needHaddock && stage == Stage1 ]
let programTargets = [ prog | Just prog <- programPath stage <$> pkgs ]
return $ libTargets ++ programTargets
need $ reverse targets
......
Markdown is supported
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