Commit a66be352 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Clean up.

parent f4fb52d1
......@@ -24,7 +24,6 @@ buildPackageDependencies _ target @ (PartialTarget stage pkg) =
hDepFile %> \file -> do
srcs <- interpretPartial target getPackageSources
when (pkg == compiler) $ need [platformH]
putBuild $ "srcs = " ++ show srcs
need srcs
if srcs == []
then writeFileChanged file ""
......
......@@ -40,12 +40,12 @@ ghcCabalHsColourArgs = builder GhcCabalHsColour ? do
-- TODO: Need compiler_stage1_CONFIGURE_OPTS += --disable-library-for-ghci?
libraryArgs :: Args
libraryArgs = do
ways <- getWays
ghci <- lift ghcWithInterpreter
ways <- getWays
withGhci <- lift ghcWithInterpreter
append [ if vanilla `elem` ways
then "--enable-library-vanilla"
else "--disable-library-vanilla"
, if vanilla `elem` ways && ghci && not dynamicGhcPrograms
, if vanilla `elem` ways && withGhci && not dynamicGhcPrograms
then "--enable-library-for-ghci"
else "--disable-library-for-ghci"
, if profiling `elem` ways
......@@ -224,12 +224,12 @@ needDll0 stage pkg = do
-- * otherwise, we must collapse it into one space-separated string.
dll0Args :: Args
dll0Args = do
stage <- getStage
pkg <- getPackage
dll0 <- lift $ needDll0 stage pkg
ghci <- lift ghcWithInterpreter
arg . unwords . concat $ [ modules | dll0 ]
++ [ ghciModules | dll0 && ghci ] -- see #9552
stage <- getStage
pkg <- getPackage
dll0 <- lift $ needDll0 stage pkg
withGhci <- lift ghcWithInterpreter
arg . unwords . concat $ [ modules | dll0 ]
++ [ ghciModules | dll0 && withGhci ] -- see #9552
where
modules = [ "Annotations"
, "ApiAnnotation"
......
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