Commit 3837187e authored by Alp Mestanogullari's avatar Alp Mestanogullari Committed by Andrey Mokhov

remove (unnecessary) recursive dependency involving ghcPath (#606)

parent d6c4e042
module Settings.Builders.Make (makeBuilderArgs) where
import Builder
import Rules.Gmp
import Rules.Libffi
import Settings.Builders.Common
......@@ -10,16 +9,9 @@ makeBuilderArgs = do
threads <- shakeThreads <$> expr getShakeOptions
gmpPath <- expr gmpBuildPath
libffiPath <- expr libffiBuildPath
ghcPath <- expr $
(-/-) <$> topDirectory <*> builderPath (Ghc CompileHs Stage2)
perlPath <- expr $ builderPath Perl
let t = show $ max 4 (threads - 2) -- Don't use all Shake's threads
mconcat
[ builder (Make gmpPath ) ? pure ["MAKEFLAGS=-j" ++ t]
, builder (Make libffiPath ) ? pure ["MAKEFLAGS=-j" ++ t, "install"]
, builder (Make "testsuite/tests") ? pure ["THREADS=" ++ t, "fast"]
, builder (Make "nofib" ) ? pure
[ "WithNofibHc=" ++ ghcPath
, "PERL=" ++ perlPath
]
]
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