[commit: ghc] wip/nfs-locking: Finalise generation of build rules from contexts. (f6a9d2f)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:21:03 UTC 2017


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

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

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

commit f6a9d2f4e67a163ba8255d8e66def0668dd492a1
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Feb 16 03:08:24 2016 +0000

    Finalise generation of build rules from contexts.
    
    See #207.


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

f6a9d2f4e67a163ba8255d8e66def0668dd492a1
 src/Rules.hs          | 10 +++-------
 src/Rules/Register.hs |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Rules.hs b/src/Rules.hs
index 4592b4a..74ffe30 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -72,13 +72,9 @@ packageRules = do
         [ buildPackageData
         , buildPackageDependencies readPackageDb
         , buildPackageDocumentation
-        , generatePackageCode ]
-
-    for_ allStages $ \stage ->
-        for_ knownPackages $ \package -> do
-            let context = vanillaContext stage package
-            buildProgram                             context
-            registerPackage           writePackageDb context
+        , generatePackageCode
+        , buildProgram
+        , registerPackage writePackageDb ]
 
 buildRules :: Rules ()
 buildRules = do
diff --git a/src/Rules/Register.hs b/src/Rules/Register.hs
index 2bbfcfc..01d8ab9 100644
--- a/src/Rules/Register.hs
+++ b/src/Rules/Register.hs
@@ -13,7 +13,6 @@ import Settings
 import Settings.Packages.Rts
 import Target
 
--- TODO: Use way from Context, #207
 -- Build package-data.mk by using GhcCabal to process pkgCabal file
 registerPackage :: [(Resource, Int)] -> Context -> Rules ()
 registerPackage rs context @ (Context {..}) = do



More information about the ghc-commits mailing list