[commit: ghc] wip/nfs-locking: Don't generate files into the source tree (7303fcf)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:42:57 UTC 2017


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

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

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

commit 7303fcf142de20186728a5b7fdea62e5a8fc83d6
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Oct 23 02:27:32 2016 +0100

    Don't generate files into the source tree
    
    See #113.


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

7303fcf142de20186728a5b7fdea62e5a8fc83d6
 src/Rules/Generate.hs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index 0a4305c..698299d 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -143,24 +143,14 @@ generatePackageCode context@(Context stage pkg _) =
             build $ Target context GenApply [] [file]
 
         priority 2.0 $ do
-            -- TODO: this is temporary hack, get rid of this (#113)
-            let oldPath = pkgPath pkg -/- contextDirectory context -/- "build"
-                olden f = oldPath ++ (drop (length (buildPath context)) f)
-
             when (pkg == compiler) $ path -/- "Config.hs" %> \file -> do
                 file <~ generateConfigHs
-                olden file <~ generateConfigHs -- TODO: get rid of this (#113)
 
             when (pkg == compiler) $ platformH stage %> \file -> do
                 file <~ generateGhcBootPlatformH
 
             when (pkg == ghcPkg) $ path -/- "Version.hs" %> \file -> do
                 file <~ generateVersionHs
-                olden file <~ generateVersionHs -- TODO: get rid of this (#113)
-
-            when (pkg == runGhc) $ path -/- "Main.hs" %> \file -> do
-                copyFileChanged (pkgPath pkg -/- "runghc.hs") file
-                putSuccess $ "| Successfully generated " ++ file ++ "."
 
 copyRules :: Rules ()
 copyRules = do



More information about the ghc-commits mailing list