[commit: ghc] wip/nfs-locking: Fix path to ghcversion.h header (0ff86b4)

[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/0ff86b4b7071cead9d50310090c86d4a18c068fa/ghc

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

commit 0ff86b4b7071cead9d50310090c86d4a18c068fa
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Oct 3 05:52:00 2016 +0900

    Fix path to ghcversion.h header
    
    See #113.


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

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

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 035318f..266141f 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -45,8 +45,6 @@ includesDependencies = fmap (generatedPath -/-)
     [ "ghcautoconf.h"
     , "ghcplatform.h"
     , "ghcversion.h" ]
-    ++ -- TODO: This is a temporary fix, see #113:
-    [ "includes/ghcversion.h"]
 
 ghcPrimDependencies :: Expr [FilePath]
 ghcPrimDependencies = do
@@ -167,8 +165,6 @@ copyRules = do
     "inplace/lib/template-hsc.h"     <~ pkgPath hsc2hs
     rtsBuildPath -/- "sm/Evac_thr.c" %> copyFile (pkgPath rts -/- "sm/Evac.c")
     rtsBuildPath -/- "sm/Scav_thr.c" %> copyFile (pkgPath rts -/- "sm/Scav.c")
-    -- TODO: This is a temporary fix, see #113:
-    "includes/ghcversion.h"          <~ generatedPath
   where
     file <~ dir = file %> copyFile (dir -/- takeFileName file)
 
diff --git a/src/Rules/Register.hs b/src/Rules/Register.hs
index ec33668..272e27b 100644
--- a/src/Rules/Register.hs
+++ b/src/Rules/Register.hs
@@ -46,7 +46,8 @@ registerPackage rs context at Context {..} = do
             let fixRtsConf = unlines
                            . map
                            ( replace "\"\"" ""
-                           . replace "rts/dist/build" rtsBuildPath )
+                           . replace "rts/dist/build" rtsBuildPath
+                           . replace "includes/dist-derivedconstants/header" generatedPath )
                            . filter (not . null)
                            . lines