[commit: ghc] wip/nfs-locking: Drop duplication of ghc_boot_platform.h (8b24f9f)

[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/8b24f9f05a7daf8b158748f4d04b4872085ec254/ghc

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

commit 8b24f9f05a7daf8b158748f4d04b4872085ec254
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Feb 7 12:30:28 2016 +0000

    Drop duplication of ghc_boot_platform.h
    
    See #98.


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

8b24f9f05a7daf8b158748f4d04b4872085ec254
 src/Rules/Generate.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 4ced436..1258d3f 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -158,8 +158,8 @@ generatePackageCode _ target @ (PartialTarget stage pkg) =
 
         priority 2.0 $ do
             -- TODO: this is temporary hack, get rid of this (#113)
-            let oldPath = pkgPath pkg -/- targetDirectory stage pkg -/- "build"
-                olden f = oldPath ++ (drop (length buildPath) f)
+            let oldPath = pkgPath pkg -/- targetDirectory stage pkg
+                olden f = oldPath ++ (drop (length (targetPath stage pkg)) f)
 
             when (pkg == compiler) $ buildPath -/- "Config.hs" %> \file -> do
                 file <~ generateConfigHs
@@ -167,7 +167,6 @@ generatePackageCode _ target @ (PartialTarget stage pkg) =
 
             when (pkg == compiler) $ platformH stage %> \file -> do
                 file <~ generateGhcBootPlatformH
-                olden file <~ generateGhcBootPlatformH -- TODO: get rid of this (#113)
 
             when (pkg == ghcPkg) $ buildPath -/- "Version.hs" %> \file -> do
                 file <~ generateVersionHs