[commit: ghc] wip/nfs-locking: Decompose Settings/Builders/Haddock.hs (see #60). (4ade862)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/4ade862d347dd04e9e61abcd0aa96a6864cb5962/ghc

>---------------------------------------------------------------

commit 4ade862d347dd04e9e61abcd0aa96a6864cb5962
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Dec 31 02:53:36 2015 +0000

    Decompose Settings/Builders/Haddock.hs (see #60).


>---------------------------------------------------------------

4ade862d347dd04e9e61abcd0aa96a6864cb5962
 src/Settings/Builders/Haddock.hs  | 12 ++----------
 src/Settings/Packages/Compiler.hs |  6 ++++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Settings/Builders/Haddock.hs b/src/Settings/Builders/Haddock.hs
index c8226fc..d626f26 100644
--- a/src/Settings/Builders/Haddock.hs
+++ b/src/Settings/Builders/Haddock.hs
@@ -43,19 +43,11 @@ haddockArgs = builder Haddock ? do
           arg "--source-module=src/%{MODULE/./-}.html"
         , specified HsColour ?
           arg "--source-entity=src/%{MODULE/./-}.html\\#%{NAME}"
-        , customPackageArgs
         , append =<< getInputs
         , arg "+RTS"
         , arg $ "-t" ++ path -/- "haddock.t"
-        , arg "--machine-readable" ]
-
-customPackageArgs :: Args
-customPackageArgs = mconcat
-    [ package compiler ? stage1 ?
-      arg "--optghc=-DSTAGE=2" ]
-    -- TODO: move to getPackageSources
-    -- , package ghcPrim  ? stage1 ?
-    --   arg "libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs" ]
+        , arg "--machine-readable"
+        , arg "-RTS" ]
 
 -- From ghc.mk:
 -- # -----------------------------------------------
diff --git a/src/Settings/Packages/Compiler.hs b/src/Settings/Packages/Compiler.hs
index 88ccf2a..0dd7551 100644
--- a/src/Settings/Packages/Compiler.hs
+++ b/src/Settings/Packages/Compiler.hs
@@ -5,7 +5,7 @@ import Expression
 import GHC (compiler)
 import Oracles.Config.Setting
 import Oracles.Config.Flag
-import Predicates (builder, builderGhc, package, notStage0)
+import Predicates (builder, builderGhc, package, notStage0, stage1)
 import Settings
 
 compilerPackageArgs :: Args
@@ -36,4 +36,6 @@ compilerPackageArgs = package compiler ? do
                 ghciWithDebugger ?
                 notStage0 ? arg "--ghc-option=-DDEBUGGER"
               , ghcProfiled ?
-                notStage0 ? arg "--ghc-pkg-option=--force" ] ]
+                notStage0 ? arg "--ghc-pkg-option=--force" ]
+
+            , builder Haddock ? stage1 ? arg "--optghc=-DSTAGE=2" ]