[commit: ghc] wip/nfs-locking: Build haddock and ghcTags in stage1 temporarily until stage2 is fixed. (c720083)

[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/c720083bc93c9b22719f2b94a3861598c594572c/ghc

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

commit c720083bc93c9b22719f2b94a3861598c594572c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Dec 21 12:00:32 2015 +0000

    Build haddock and ghcTags in stage1 temporarily until stage2 is fixed.


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

c720083bc93c9b22719f2b94a3861598c594572c
 src/GHC.hs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/GHC.hs b/src/GHC.hs
index f47242a..f528052 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -106,11 +106,17 @@ defaultTargetDirectory stage pkg
     | otherwise         = "dist-install"
 
 -- TODO: simplify
+-- TODO: haddock and ghtTags should be built in stage2 only
 -- | Returns a relative path to the program executable
 defaultProgramPath :: Stage -> Package -> Maybe FilePath
 defaultProgramPath stage pkg
     | pkg == ghc     = Just . inplaceProgram $ "ghc-stage" ++ show (fromEnum stage + 1)
     | pkg == haddock = case stage of
+        Stage1 -> Just . inplaceProgram $ pkgName pkg
+        Stage2 -> Just . inplaceProgram $ pkgName pkg
+        _      -> Nothing
+    | pkg == ghcTags = case stage of
+        Stage1 -> Just . inplaceProgram $ pkgName pkg
         Stage2 -> Just . inplaceProgram $ pkgName pkg
         _      -> Nothing
     | isProgram pkg  = case stage of