[commit: ghc] wip/nfs-locking: Fix path to Config.hs (#47). (44d81b0)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:47:29 UTC 2017


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

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

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

commit 44d81b0961073c172630fd52b76985fa9a6601b3
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Dec 26 14:42:49 2015 +0000

    Fix path to Config.hs (#47).


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

44d81b0961073c172630fd52b76985fa9a6601b3
 src/Rules/Generate.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index f9c1e0b..bf0afa0 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -71,15 +71,15 @@ generatePackageCode _ target @ (PartialTarget stage pkg) =
                 build $ fullTarget target GenPrimopCode [primopsTxt] [file]
 
         priority 2.0 $ do
-            when (pkg == ghcPkg) $ buildPath -/- "Config.hs" %> \file -> do
+            when (pkg == compiler) $ buildPath -/- "Config.hs" %> \file -> do
                 file <~ generateConfigHs
 
-            when (pkg == ghcPkg) $ buildPath -/- "Version.hs" %> \file -> do
-                file <~ generateVersionHs
-
             when (pkg == compiler) $ platformH %> \file -> do
                 file <~ generateGhcBootPlatformH
 
+            when (pkg == ghcPkg) $ buildPath -/- "Version.hs" %> \file -> do
+                file <~ generateVersionHs
+
             when (pkg == runghc) $ buildPath -/- "Main.hs" %> \file -> do
                 copyFileChanged (pkgPath pkg -/- "runghc.hs") file
                 putBuild $ "| Successfully generated '" ++ file ++ "'."



More information about the ghc-commits mailing list