Skip to content

Commit ed4454e

Browse files
committed
fix pkgsToBuildInPlaceOnly
1 parent f792667 commit ed4454e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

cabal-install/src/Distribution/Client/ProjectPlanning.hs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,16 +2463,18 @@ elaborateInstallPlan
24632463
shouldBuildInplaceOnly :: SolverPackage loc -> Bool
24642464
shouldBuildInplaceOnly pkg =
24652465
Set.member
2466-
(packageId pkg)
2466+
(solverId (ResolverPackage.Configured pkg))
24672467
pkgsToBuildInplaceOnly
24682468

2469-
pkgsToBuildInplaceOnly :: Set PackageId
2469+
2470+
-- The reverse dependencies of solver packages which match a package id in pkgLocalToProject.
2471+
pkgsToBuildInplaceOnly :: Set SolverId
24702472
pkgsToBuildInplaceOnly =
2471-
Set.fromList [
2472-
packageId pkg
2473-
| stage <- stages
2474-
, let solverIds = [PlannedId stage pkgId | pkgId <- Set.toList pkgsLocalToProject]
2475-
, pkg <- SolverInstallPlan.reverseDependencyClosure solverPlan solverIds
2473+
Set.fromList
2474+
[ solverId pkg
2475+
| spkg <- SolverInstallPlan.toList solverPlan
2476+
, packageId spkg `elem` pkgsLocalToProject
2477+
, pkg <- SolverInstallPlan.reverseDependencyClosure solverPlan [solverId spkg]
24762478
]
24772479

24782480
isLocalToProject :: Package pkg => pkg -> Bool

0 commit comments

Comments
 (0)