diff options
Diffstat (limited to 'Omni/Bild.hs')
| -rwxr-xr-x | Omni/Bild.hs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Omni/Bild.hs b/Omni/Bild.hs index f84b08c..1bb42db 100755 --- a/Omni/Bild.hs +++ b/Omni/Bild.hs @@ -964,19 +964,15 @@ build andTest loud jobs cpus analysis = do result <- case compiler of CPython -> case out of Just _ -> - LogC.updateCurrentLine namespace "bild: nix: python" - >> nixBuild loud jobs cpus target + nixBuild loud jobs cpus target +> (\r -> (isSuccess (fst r) && andTest) ?: (test loud target, pure r)) Nothing -> - LogC.updateCurrentLine namespace "cannot build library" - >> pure (Exit.ExitSuccess, mempty) + pure (Exit.ExitSuccess, mempty) Gcc -> - LogC.updateCurrentLine namespace "bild: nix: gcc" - >> nixBuild loud jobs cpus target + nixBuild loud jobs cpus target Ghc -> case out of Nothing -> pure (Exit.ExitSuccess, mempty) Just _ -> do - LogC.updateCurrentLine namespace ("bild: nix: " <> user <> "@" <> host) result <- nixBuild loud jobs cpus target if andTest && (isSuccess <| fst result) then test loud target |