[commit: ghc] wip/nfs-locking: Fix compilerPackageArgs (Haddock builder). (02b0d75)

[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/02b0d758636e8b9cf79845d7cf786c3154bfad28/ghc

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

commit 02b0d758636e8b9cf79845d7cf786c3154bfad28
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Dec 31 12:15:02 2015 +0000

    Fix compilerPackageArgs (Haddock builder).


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

02b0d758636e8b9cf79845d7cf786c3154bfad28
 src/Settings/Packages/Compiler.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Packages/Compiler.hs b/src/Settings/Packages/Compiler.hs
index 0dd7551..c2f31e6 100644
--- a/src/Settings/Packages/Compiler.hs
+++ b/src/Settings/Packages/Compiler.hs
@@ -5,16 +5,17 @@ import Expression
 import GHC (compiler)
 import Oracles.Config.Setting
 import Oracles.Config.Flag
-import Predicates (builder, builderGhc, package, notStage0, stage1)
+import Predicates (builder, builderGhc, package, notStage0)
 import Settings
 
 compilerPackageArgs :: Args
 compilerPackageArgs = package compiler ? do
     stage   <- getStage
     rtsWays <- getRtsWays
+    path    <- getTargetPath
     mconcat [ builder Alex ? arg "--latin1"
 
-            , builderGhc ? arg ("-I" ++ pkgPath compiler -/- stageString stage)
+            , builderGhc ? arg ("-I" ++ path)
 
             , builder GhcCabal ? mconcat
               [ arg $ "--ghc-option=-DSTAGE=" ++ show (fromEnum stage + 1)
@@ -38,4 +39,4 @@ compilerPackageArgs = package compiler ? do
               , ghcProfiled ?
                 notStage0 ? arg "--ghc-pkg-option=--force" ]
 
-            , builder Haddock ? stage1 ? arg "--optghc=-DSTAGE=2" ]
+            , builder Haddock ? arg ("--optghc=-I" ++ path) ]