[commit: ghc] wip/nfs-locking: Adapt to Cabal library API changes (a931066)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:07:52 UTC 2017


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

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

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

commit a931066df88efc745bdd310b3c64aa25834ba243
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Aug 11 00:41:02 2016 +0100

    Adapt to Cabal library API changes
    
    Fix #282.


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

a931066df88efc745bdd310b3c64aa25834ba243
 src/Rules/Cabal.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Rules/Cabal.hs b/src/Rules/Cabal.hs
index e2cdb0f..ed72f93 100644
--- a/src/Rules/Cabal.hs
+++ b/src/Rules/Cabal.hs
@@ -35,8 +35,7 @@ cabalRules = do
             else do
                 need [pkgCabalFile pkg]
                 pd <- liftIO . readPackageDescription silent $ pkgCabalFile pkg
-                -- TODO: Support more than one Cabal library per package.
-                let depsLib  = collectDeps . fmap snd . listToMaybe $ condLibraries pd
+                let depsLib  = collectDeps $ condLibrary pd
                     depsExes = map (collectDeps . Just . snd) $ condExecutables pd
                     deps     = concat $ depsLib : depsExes
                     depNames = [ name | Dependency (DP.PackageName name) _ <- deps ]



More information about the ghc-commits mailing list