@@ -135,6 +135,7 @@ iiBuildTools InstallInfo { iiPackageDB = PackageDB m, iiPackages = packages } =
135 -- FIXME possible improvement: track the dependencies between the build
135 -- FIXME possible improvement: track the dependencies between the build
136 -- tools themselves, and install them in the correct order.
136 -- tools themselves, and install them in the correct order.
137 map unPackageName
137 map unPackageName
138+ $ filter (flip Set.notMember coreTools)
138 $ filter (flip Map.member m)
139 $ filter (flip Map.member m)
139 $ Set.toList
140 $ Set.toList
140 $ Set.unions
141 $ Set.unions
@@ -145,3 +146,7 @@ iiBuildTools InstallInfo { iiPackageDB = PackageDB m, iiPackages = packages } =
145 unPackageName (PackageName pn) = pn
146 unPackageName (PackageName pn) = pn
146 isSelected name _ = name `Set.member` selected
147 isSelected name _ = name `Set.member` selected
147 selected = Set.fromList $ Map.keys packages
148 selected = Set.fromList $ Map.keys packages
150+ -- Build tools shipped with GHC which we should not attempt to build
152+ coreTools = Set.fromList $ map PackageName $ words "hsc2hs"