[commit: ghc] wip/nfs-locking: Drop redundant top-level rts target (cf73599)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:30:04 UTC 2017


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

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

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

commit cf7359904f868be93defcdf4a9a65974d8224cb4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 7 14:33:25 2017 +0000

    Drop redundant top-level rts target


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

cf7359904f868be93defcdf4a9a65974d8224cb4
 src/Rules.hs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Rules.hs b/src/Rules.hs
index be7c89b..8db01f4 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -27,16 +27,8 @@ allStages = [minBound ..]
 -- | This rule 'need' all top-level build targets.
 topLevelTargets :: Rules ()
 topLevelTargets = do
-
     want $ Rules.Generate.installTargets
 
-    -- TODO: Do we want libffiLibrary to be a top-level target?
-
-    action $ do -- TODO: Add support for all rtsWays
-        rtsLib    <- pkgLibraryFile $ rtsContext { way = vanilla  }
-        rtsThrLib <- pkgLibraryFile $ rtsContext { way = threaded }
-        need [ rtsLib, rtsThrLib ]
-
     forM_ allStages $ \stage ->
         forM_ (knownPackages \\ [rts, libffi]) $ \pkg -> action $ do
             let context = vanillaContext stage pkg
@@ -48,7 +40,7 @@ topLevelTargets = do
                     libs <- mapM (pkgLibraryFile . Context stage pkg) ways
                     docs <- interpretInContext context $ buildHaddock flavour
                     need $ libs ++ [ pkgHaddockFile context | docs && stage == Stage1 ]
-                else do -- otherwise build a program
+                else -- otherwise build a program
                     need =<< maybeToList <$> programPath (programContext stage pkg)
 
 packageRules :: Rules ()



More information about the ghc-commits mailing list