[commit: Cabal] master: merging modular solver with main branch (8c12a32)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8c12a322cc18932e562294d0fee1a6f7b4521e38

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

commit 8c12a322cc18932e562294d0fee1a6f7b4521e38
Author: Andres Loeh <andres at well-typed.com>
Date:   Fri Oct 21 07:17:36 2011 +0000

    merging modular solver with main branch

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

 .../Client/Dependency/Modular/IndexConversion.hs   |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs b/cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs
index cc4d774..b24db6a 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs
@@ -84,14 +84,15 @@ convGPD :: OS -> Arch -> CompilerId ->
            PI PN -> GenericPackageDescription -> PInfo
 convGPD os arch cid
         pi@(PI _pn _i)
-        (GenericPackageDescription _ flags libs exes tests) =
+        (GenericPackageDescription _ flags libs exes tests benchs) =
   let
     fds = flagDefaults flags
   in
     PInfo
-      (maybe []  (convCondTree os arch cid pi fds (const True))          libs   ++
-       concatMap (convCondTree os arch cid pi fds (const True) . snd)    exes   ++
-       concatMap (convCondTree os arch cid pi fds testEnabled  . snd)    tests)
+      (maybe []  (convCondTree os arch cid pi fds (const True)          ) libs   ++
+       concatMap (convCondTree os arch cid pi fds (const True)     . snd) exes   ++
+       concatMap (convCondTree os arch cid pi fds testEnabled      . snd) tests  ++
+       concatMap (convCondTree os arch cid pi fds benchmarkEnabled . snd) benchs)
       fds
       [] -- TODO: add encaps