haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-29 07:30:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't worry about core executables

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-11 16:30:05 +02:00
parent 31036c12f9
commit 29230aa366
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Stackage2/PerformBuild.hs
View File

@ -74,7 +74,9 @@ waitForDeps toolMap packageMap activeComps bp pi action = do
mapM_ checkPackage $ Map.keys $ filterUnused $ sdPackages $ ppDesc $ piPlan pi mapM_ checkPackage $ Map.keys $ filterUnused $ sdPackages $ ppDesc $ piPlan pi
forM_ (Map.keys $ filterUnused $ sdTools $ ppDesc $ piPlan pi) $ \exe -> do forM_ (Map.keys $ filterUnused $ sdTools $ ppDesc $ piPlan pi) $ \exe -> do
case lookup exe toolMap >>= fromNullable . map checkPackage . setToList of case lookup exe toolMap >>= fromNullable . map checkPackage . setToList of
Nothing -> throwSTM $ ToolMissing exe Nothing
| isCoreExe exe -> return ()
| otherwise -> throwSTM $ ToolMissing exe
Just packages -> ofoldl1' (<|>) packages Just packages -> ofoldl1' (<|>) packages
action action
where where
@ -95,6 +97,7 @@ waitForDeps toolMap packageMap activeComps bp pi action = do
unless res $ throwSTM $ DependencyFailed package unless res $ throwSTM $ DependencyFailed package
isCore = (`member` siCorePackages (bpSystemInfo bp)) isCore = (`member` siCorePackages (bpSystemInfo bp))
isCoreExe = (`member` siCoreExecutables (bpSystemInfo bp))
withCounter counter = bracket_ withCounter counter = bracket_
(atomically $ modifyTVar counter (+ 1)) (atomically $ modifyTVar counter (+ 1))