remove (unnecessary) recursive dependency involving ghcPath (#606)
authorAlp Mestanogullari <alpmestan@gmail.com>
Fri, 18 May 2018 09:58:12 +0000 (11:58 +0200)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Fri, 18 May 2018 09:58:12 +0000 (11:58 +0200)
src/Settings/Builders/Make.hs

index 79d73cc..d231fd7 100644 (file)
@@ -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
-            ]
         ]