[commit: ghc] wip/nfs-locking: Another tweak of generated dependencies. (ba41ec6)

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

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

commit ba41ec6a9b2db3708b1076fef2c4391d4887875d
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 5 01:54:50 2016 +0000

    Another tweak of generated dependencies.


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

ba41ec6a9b2db3708b1076fef2c4391d4887875d
 src/Rules/Generate.hs | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 13d5806..6a4270b 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -51,35 +51,28 @@ derivedConstantsDependencies = (derivedConstantsPath -/-) <$>
 compilerDependencies :: Stage -> [FilePath]
 compilerDependencies stage =
     [ platformH stage ]
-    ++
-    fmap ((targetPath stage compiler -/- "build") -/-)
-    [ "primop-vector-uniques.hs-incl"
-    , "primop-data-decl.hs-incl"
-    , "primop-tag.hs-incl"
-    , "primop-list.hs-incl"
-    , "primop-strictness.hs-incl"
-    , "primop-fixity.hs-incl"
-    , "primop-primop-info.hs-incl"
-    , "primop-out-of-line.hs-incl"
-    , "primop-has-side-effects.hs-incl"
-    , "primop-can-fail.hs-incl"
-    , "primop-code-size.hs-incl"
-    , "primop-commutable.hs-incl"
-    , "primop-vector-tys-exports.hs-incl"
-    , "primop-vector-tycons.hs-incl"
-    , "primop-vector-tys.hs-incl" ]
-    ++
-    if stage == Stage0
-    then defaultDependencies ++ derivedConstantsDependencies
-    else []
-
-
--- TODO: can we drop COMPILER_INCLUDES_DEPS += $(includes_GHCCONSTANTS)?
+    ++ defaultDependencies ++ derivedConstantsDependencies
+    ++ fmap ((targetPath stage compiler -/- "build") -/-)
+       [ "primop-vector-uniques.hs-incl"
+       , "primop-data-decl.hs-incl"
+       , "primop-tag.hs-incl"
+       , "primop-list.hs-incl"
+       , "primop-strictness.hs-incl"
+       , "primop-fixity.hs-incl"
+       , "primop-primop-info.hs-incl"
+       , "primop-out-of-line.hs-incl"
+       , "primop-has-side-effects.hs-incl"
+       , "primop-can-fail.hs-incl"
+       , "primop-code-size.hs-incl"
+       , "primop-commutable.hs-incl"
+       , "primop-vector-tys-exports.hs-incl"
+       , "primop-vector-tycons.hs-incl"
+       , "primop-vector-tys.hs-incl" ]
+
 generatedDependencies :: Stage -> Package -> [FilePath]
 generatedDependencies stage pkg
     | pkg == compiler = compilerDependencies stage
     | stage == Stage0 = defaultDependencies
-    | stage == Stage1 = derivedConstantsDependencies
     | otherwise = []
 
 -- The following generators and corresponding source extensions are supported: