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

Add userPackages for overriding default list of target packages.

parent 5d6c2d7a
......@@ -89,7 +89,7 @@ interpret = flip runReaderT
fromDiff :: Monoid a => DiffExpr a -> Expr a
fromDiff = fmap (($ mempty) . appEndo)
interpretDiff :: Environment -> Expr a -> Action a
interpretDiff :: Monoid a => Environment -> DiffExpr a -> Action a
interpretDiff env = interpret env . fromDiff
applyPredicate :: Monoid a => Predicate -> Expr a -> Expr a
......
......@@ -10,6 +10,7 @@ import Targets
import Settings
import Package
import Expression
import UserSettings
import Rules.Package
-- generateTargets needs package-data.mk files of all target packages
......
module Targets (
targetWays, targetPackages, targetDirectory, allPackages,
customConfigureSettings,
array, base, binPackageDb, binary, bytestring, cabal, containers, deepseq,
directory, filepath, ghcPrim, haskeline, hoopl, hpc, integerLibrary,
parallel, pretty, primitive, process, stm, templateHaskell, terminfo, time,
transformers, unix, win32, xhtml
array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
deepseq, directory, filepath, ghcPrim, haskeline, hoopl, hpc,
integerLibrary, parallel, pretty, primitive, process, stm, templateHaskell,
terminfo, time, transformers, unix, win32, xhtml
) where
import Ways hiding (parallel)
......
......@@ -3,8 +3,8 @@ module UserSettings (
) where
import Base hiding (arg, args, Args)
import Rules.Data
import Oracles.Builder
import Targets
import Expression
import Expression.Settings
......@@ -14,7 +14,7 @@ userSettings = mconcat
, builder (Ghc Stage0) ? remove ["-O2"]
, builder GhcCabal ? removeSub "--configure-option=CFLAGS" ["-Werror"] ]
userPackages :: Settings
userPackages :: Packages
userPackages = mconcat
[ stage Stage1 ? remove [cabal]
, remove [compiler] ]
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