Fix build with GHC 7.4.2

haskell · Nov 15, 2015 · ae1199e · ae1199e
1 parent f16cd08
commit ae1199e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Cabal/Distribution/PackageDescription/Configuration.hs b/Cabal/Distribution/PackageDescription/Configuration.hs
@@ -60,7 +60,6 @@ import Data.Char ( isAlphaNum )
 import Data.Maybe ( mapMaybe, maybeToList )
 import Data.Map ( Map, fromListWith, toList )
 import qualified Data.Map as Map
-import qualified Data.Map.Strict as StrictMap
 import Data.Monoid as Mon
 
 ------------------------------------------------------------------------------
@@ -270,9 +269,9 @@ resolveWithFlags dom os arch impl constrs trees checkDeps =
     mp m@(Right _) _           = m
     mp _           m@(Right _) = m
     mp (Left xs)   (Left ys)   =
-        let union = StrictMap.unionWith
-                    (\x y -> simplifyVersionRange $ unionVersionRanges x y)
+        let union = Map.foldrWithKey (Map.insertWith' combine)
                     (unDepMapUnion xs) (unDepMapUnion ys)
+            combine x y = simplifyVersionRange $ unionVersionRanges x y
         in union `seq` Left (DepMapUnion union)
 
     -- `mzero'