Skip to content

Commit af228b0

Browse files
committed
fix pkgsToBuildInPlaceOnly
1 parent 6b659b7 commit af228b0

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
@@ -2461,16 +2461,18 @@ elaborateInstallPlan
24612461
shouldBuildInplaceOnly :: SolverPackage loc -> Bool
24622462
shouldBuildInplaceOnly pkg =
24632463
Set.member
2464-
(packageId pkg)
2464+
(solverId (ResolverPackage.Configured pkg))
24652465
pkgsToBuildInplaceOnly
24662466

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

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

0 commit comments

Comments
 (0)