From 29230aa36676f907679c4698b1a4dfc8d5f3de20 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 11 Dec 2014 16:30:05 +0200 Subject: [PATCH] Don't worry about core executables --- Stackage2/PerformBuild.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Stackage2/PerformBuild.hs b/Stackage2/PerformBuild.hs index 17d2d7fb..0a1b6035 100644 --- a/Stackage2/PerformBuild.hs +++ b/Stackage2/PerformBuild.hs @@ -74,7 +74,9 @@ waitForDeps toolMap packageMap activeComps bp pi action = do mapM_ checkPackage $ Map.keys $ filterUnused $ sdPackages $ ppDesc $ piPlan pi forM_ (Map.keys $ filterUnused $ sdTools $ ppDesc $ piPlan pi) $ \exe -> do 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 action where @@ -95,6 +97,7 @@ waitForDeps toolMap packageMap activeComps bp pi action = do unless res $ throwSTM $ DependencyFailed package isCore = (`member` siCorePackages (bpSystemInfo bp)) + isCoreExe = (`member` siCoreExecutables (bpSystemInfo bp)) withCounter counter = bracket_ (atomically $ modifyTVar counter (+ 1))