[commit: ghc] wip/nfs-locking: Fix boot package constraints. (3ee9ae2)

[git at git.haskell.org]

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

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

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

commit 3ee9ae25495416fa212741f062e56016c7c573c4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 04:12:21 2015 +0000

    Fix boot package constraints.


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

3ee9ae25495416fa212741f062e56016c7c573c4
 src/Rules/Cabal.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Cabal.hs b/src/Rules/Cabal.hs
index 7ccb1b8..d8e557b 100644
--- a/src/Rules/Cabal.hs
+++ b/src/Rules/Cabal.hs
@@ -1,11 +1,12 @@
 module Rules.Cabal (cabalRules) where
 
-import Expression
 import Data.Version
 import Distribution.Package hiding (Package)
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parse
 import Distribution.Verbosity
+import Expression
+import GHC
 import Package hiding (library)
 import Settings
 
@@ -13,7 +14,8 @@ cabalRules :: Rules ()
 cabalRules = do
     -- Cache boot package constraints (to be used in cabalArgs)
     bootPackageConstraints %> \out -> do
-        pkgs <- interpretWithStage Stage0 getPackages
+        bootPkgs <- interpretWithStage Stage0 getPackages
+        let pkgs = filter (\p -> p /= compiler && isLibrary p) bootPkgs
         constraints <- forM (sort pkgs) $ \pkg -> do
             need [pkgCabalFile pkg]
             pd <- liftIO . readPackageDescription silent $ pkgCabalFile pkg