[commit: ghc] wip/nfs-locking: Drop package self-dependencies (ff322d9)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:18:22 UTC 2017


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

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

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

commit ff322d9a37a5c9a406e28eab703334737ae20cba
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Apr 27 00:20:42 2017 +0100

    Drop package self-dependencies
    
    This occurs in iserv-bin package, which contains both a library and an executable.
    
    See #12


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

ff322d9a37a5c9a406e28eab703334737ae20cba
 src/Rules/Cabal.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Rules/Cabal.hs b/src/Rules/Cabal.hs
index b45af42..ad1312f 100644
--- a/src/Rules/Cabal.hs
+++ b/src/Rules/Cabal.hs
@@ -42,7 +42,7 @@ cabalRules = do
                     depsExes = map (collectDeps . Just . snd) $ condExecutables pd
                     deps     = concat $ depsLib : depsExes
                     depNames = [ unPackageName name | Dependency name _ <- deps ]
-                return . unwords $ pkgNameString pkg : sort depNames
+                return . unwords $ pkgNameString pkg : (sort depNames \\ [pkgNameString pkg])
         writeFileChanged out $ unlines pkgDeps
         putSuccess $ "| Successfully computed package dependencies"
 



More information about the ghc-commits mailing list