[commit: hadrian] master: remove (unnecessary) recursive dependency involving ghcPath (#606) (3837187)
git at git.haskell.org
git at git.haskell.org
Fri Jun 8 00:02:29 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/3837187e57bfcc9c00a717eb70cb3e9271525047
>---------------------------------------------------------------
commit 3837187e57bfcc9c00a717eb70cb3e9271525047
Author: Alp Mestanogullari <alpmestan at gmail.com>
Date: Fri May 18 11:58:12 2018 +0200
remove (unnecessary) recursive dependency involving ghcPath (#606)
>---------------------------------------------------------------
3837187e57bfcc9c00a717eb70cb3e9271525047
src/Settings/Builders/Make.hs | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/Settings/Builders/Make.hs b/src/Settings/Builders/Make.hs
index 79d73cc..d231fd7 100644
--- a/src/Settings/Builders/Make.hs
+++ b/src/Settings/Builders/Make.hs
@@ -1,6 +1,5 @@
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
- ]
]
More information about the ghc-commits
mailing list