Skip to content

Commit a68d450

Browse files
committed
Plan with build _and_ host package indices.
1 parent cca7205 commit a68d450

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,12 @@ rebuildInstallPlan
770770
, hookHashes
771771
)
772772
$ do
773-
installedPkgIndex <-
773+
hinstalledPkgIndex <-
774+
getInstalledPackages
775+
verbosity
776+
(hostToolchain toolchains)
777+
corePackageDbs
778+
binstalledPkgIndex <-
774779
getInstalledPackages
775780
verbosity
776781
(buildToolchain toolchains)
@@ -796,9 +801,9 @@ rebuildInstallPlan
796801
foldProgress logMsg (pure . Left) (pure . Right) $
797802
planPackages
798803
verbosity
799-
(hostToolchain toolchains)
804+
(hostToolchain toolchains) -- FIXME: this should be `toolchains`.
800805
solverSettings
801-
(installedPackages <> installedPkgIndex)
806+
(installedPackages <> hinstalledPkgIndex <> binstalledPkgIndex)
802807
sourcePkgDb
803808
pkgConfigDB
804809
localPackages

0 commit comments

Comments
 (0)