Skip to content

Commit

Permalink
Merge branch 'pr/83'
Browse files Browse the repository at this point in the history
  • Loading branch information
process-bot committed Apr 5, 2016
2 parents 7419693 + 129e6a8 commit 5b60874
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import System.Exit (exitFailure)
import GHC.Conc (getNumProcessors, setNumCapabilities)
import GHC.IO.Encoding (setLocaleEncoding, utf8)

import qualified BuildManager as BM
import qualified Flags
Expand All @@ -18,7 +19,9 @@ import TheMasterPlan (ProjectGraph(..), ProjectData(..))

main :: IO ()
main =
do setNumCapabilities =<< getNumProcessors
do setLocaleEncoding utf8

setNumCapabilities =<< getNumProcessors

result <- BM.run make
case result of
Expand Down

0 comments on commit 5b60874

Please sign in to comment.