[commit: ghc] wip/nfs-locking: Add Cabal/Cabal to list of packages. (8bdefdd)

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


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

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

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

commit 8bdefdd7cbb9cd1c558d7f01f05a79ec4ff25a6e
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 14 04:01:55 2015 +0000

    Add Cabal/Cabal to list of packages.


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

8bdefdd7cbb9cd1c558d7f01f05a79ec4ff25a6e
 src/Package.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Package.hs b/src/Package.hs
index e815c4b..5d16d22 100644
--- a/src/Package.hs
+++ b/src/Package.hs
@@ -13,7 +13,8 @@ packages :: [Package]
 packages = [libraryPackage "array"          Stage1 defaultSettings,
             libraryPackage "bin-package-db" Stage1 defaultSettings,
             libraryPackage "binary"         Stage1 defaultSettings,
-            libraryPackage "deepseq"        Stage1 defaultSettings]
+            libraryPackage "deepseq"        Stage1 defaultSettings,
+            libraryPackage "Cabal/Cabal"    Stage1 defaultSettings]
 
 -- Rule buildPackageX is defined in module Package.X
 buildPackage :: Package -> TodoItem -> Rules ()
@@ -28,7 +29,8 @@ packageRules = do
     forM_ packages $ \pkg @ (Package name path todo) -> do
         forM_ todo $ \todoItem @ (stage, dist, settings) -> do
 
-            -- Want top .o and .a files for the pkg/todo combo:
+            -- Want top .o and .a files for the pkg/todo combo
+            -- TODO: Check BUILD_GHCI_LIB flag to decide if .o is needed
             action $ do
                 let buildDir = path </> dist </> "build"
                     pkgData  = path </> dist </> "package-data.mk"



More information about the ghc-commits mailing list