This commit is contained in:
Lemmih 2007-01-29 03:20:59 +00:00
parent bc5726ccd2
commit 9b3069cb3d

View File

@ -284,7 +284,8 @@ addPkgConf f = do
union :: PkgEnvs -> [PackageConfig] -> PkgEnvs union :: PkgEnvs -> [PackageConfig] -> PkgEnvs
union ls ps' = union ls ps' =
let fm = emptyFM -- new FM for this package.conf let fm = emptyFM -- new FM for this package.conf
in foldr (\p fm' -> if packageName_ p == "base" in foldr (\p fm' -> if packageName_ p == "base" -- ghc doesn't supply a version with 'base'
-- for some reason.
then addToFM fm' (packageName_ p) p then addToFM fm' (packageName_ p) p
else addToFM fm' (packageName p) p) fm ps' : ls else addToFM fm' (packageName p) p) fm ps' : ls