[commit: ghc] wip/nfs-locking: Fix missing generated dependencies for rts, see #123. (f187ca8)

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

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

commit f187ca8af97a2a45a3a1d09b87dbdc12d4819987
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 7 11:20:36 2016 +0000

    Fix missing generated dependencies for rts, see #123.


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

f187ca8af97a2a45a3a1d09b87dbdc12d4819987
 src/Rules/Data.hs     | 5 ++---
 src/Rules/Generate.hs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index 29f8d3d..ee15c19 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -104,9 +104,8 @@ buildPackageData rs target @ (PartialTarget stage pkg) = do
                     fullTarget target (GhcPkg stage) [rtsConf] []
 
             rtsConf %> \_ -> do
-                need [ rtsConfIn
-                     , "includes/ghcautoconf.h"
-                     , "includes/ghcplatform.h" ]
+                orderOnly $ generatedDependencies stage pkg
+                need [ rtsConfIn ]
                 build $ fullTarget target HsCpp [rtsConfIn] [rtsConf]
 
                 let fixRtsConf = unlines
diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 3eb1231..8ca7b94 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -76,7 +76,7 @@ generatedDependencies :: Stage -> Package -> [FilePath]
 generatedDependencies stage pkg
     | pkg   == compiler = compilerDependencies stage
     | pkg   == ghcPrim  = ghcPrimDependencies stage
-    | pkg   == rts      = derivedConstantsDependencies
+    | pkg   == rts      = includesDependencies ++ derivedConstantsDependencies
     | stage == Stage0   = defaultDependencies
     | otherwise         = []