[commit: ghc] wip/nfs-locking: Add haddock build targets. (d811225)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:18:07 UTC 2017


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

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

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

commit d811225729618537302bde9cba2d591a2dd54ef4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Aug 19 02:37:30 2015 +0100

    Add haddock build targets.


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

d811225729618537302bde9cba2d591a2dd54ef4
 src/Rules.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Rules.hs b/src/Rules.hs
index 43f5922..65ae2e4 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -14,6 +14,7 @@ import Rules.Package
 import Rules.Oracles
 import Rules.Resources
 import Settings.Ways
+import Settings.User
 import Settings.Util
 import Settings.Packages
 import Settings.TargetDirectory
@@ -28,15 +29,17 @@ generateTargets = action $ do
                 buildPath = targetPath stage pkg -/- "build"
             buildGhciLib <- interpret target $ getPkgData BuildGhciLib
             pkgKey       <- interpret target $ getPkgData PackageKey
+            buildHaddock <- interpret target $ Settings.User.buildHaddock
             let ghciLib = [ buildPath -/- "HS" ++ pkgKey <.> "o"
                           | buildGhciLib == "YES" && stage /= Stage0 ]
+                haddock = [ pkgHaddockPath pkg | buildHaddock ]
 
             ways <- interpret target getWays
             libs <- forM ways $ \way -> do
                 extension <- libsuf way
                 return $ buildPath -/- "libHS" ++ pkgKey <.> extension
 
-            return $ ghciLib ++ libs
+            return $ ghciLib ++ libs ++ haddock
 
     need $ reverse targets
 



More information about the ghc-commits mailing list