fixup! Add compiler to PackageId

(cherry picked from commit 1259214)

Author: angerman

cabal-install-solver/src/Distribution/Solver/Modular/IndexConversion.hs

@@ -88,7 +88,7 @@ convIPI' toolchains (ShadowPkgs sip) idx =
 -- | Extract/recover the package ID from an installed package info, and convert it to a solver's I.
 convId :: Toolchains -> IPI.InstalledPackageInfo -> (PN, I)
 convId toolchains ipi = (pn, I stage ver $ Inst $ IPI.installedUnitId ipi)
-  where MungedPackageId mpn ver = mungedId ipi
+  where MungedPackageId mpn ver compid = mungedId ipi
         -- HACK. See Note [Index conversion with internal libraries]
         pn = encodeCompatPackageName mpn
         stage = case IPI.pkgCompiler ipi of
@@ -172,7 +172,7 @@ convSPI' toolchains constraints strfl solveExes =
 -- | Convert a single source package into the solver-specific format.
 convSP :: Toolchains -> Map PN [LabeledPackageConstraint]
        -> StrongFlags -> SolveExecutables -> SourcePackage loc -> [(PN, I, PInfo)]
-convSP toolchains constraints strfl solveExes (SourcePackage (PackageIdentifier pn pv) gpd _ _pl) =
+convSP toolchains constraints strfl solveExes (SourcePackage (PackageIdentifier pn pv _compid) gpd _ _pl) =
   let pkgConstraints = fromMaybe [] $ M.lookup pn constraints
   in  [(pn, I Host  pv InRepo, convGPD (hostToolchain toolchains)  pkgConstraints strfl solveExes pn gpd)
       ,(pn, I Build pv InRepo, convGPD (buildToolchain toolchains) pkgConstraints strfl solveExes pn gpd)]

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

@@ -198,6 +198,7 @@ import Distribution.Types.GivenComponent
 import Distribution.Types.LibraryName
 import qualified Distribution.Types.LocalBuildConfig as LBC
 import Distribution.Types.PackageVersionConstraint
+import qualified Distribution.Types.PackageId as PI
 import Distribution.Types.PkgconfigDependency
 import Distribution.Types.UnqualComponentName
 
@@ -791,8 +792,21 @@ rebuildInstallPlan
               -- }
               -- deriving (Eq, Generic, Show, Read)
               --
-              -- can probably use fromList $ Map.elems $ on it.
+              -- let mapPkgIdx f = PI.fromList . map f . PI.allPackages
+              -- let updateIPI :: IPI.InstalledPackageInfo -> IPI.InstalledPackageInfo
+              --     updateIPI ipi = ipi {
+              --       IPI.sourcePackageId = (IPI.sourcePackageId ipi){ PI.pkgCompiler = IPI.pkgCompiler ipi }
+              --      }
+              -- let addCompilerToSourcePkg :: CompilerId -> [PackageSpecifier UnresolvedSourcePackage] -> [PackageSpecifier UnresolvedSourcePackage]
+              --     addCompilerToSourcePkg compilerId = map (addCompilerId compilerId)
+              --     addCompilerId :: CompilerId -> PackageSpecifier UnresolvedSourcePackage -> PackageSpecifier UnresolvedSourcePackage
+              --     addCompilerId compilerId (NamedPackage name props) = NamedPackage name props
+              --     addCompilerId compilerId (SpecificSourcePackage pkg) = SpecificSourcePackage (f pkg)
+              --       where f :: SourcePackage UnresolvedPkgLoc -> SourcePackage UnresolvedPkgLoc
+              --             f pkg = pkg{srcpkgPackageId = (srcpkgPackageId pkg){pkgCompiler = Just compilerId}}
+
               hinstalledPkgIndex <-
+                -- mapPkgIdx updateIPI <$>
                 getInstalledPackages
                   verbosity
                   (hostToolchain toolchains)
@@ -802,13 +816,16 @@ rebuildInstallPlan
               -- for now. FIXME!
               -- let hinstalledPkgIndex' = PI.fromList $ PI.allPackages hinstalledPkgIndex
               binstalledPkgIndex <-
+                -- mapPkgIdx updateIPI <$>
                 getInstalledPackages
                   verbosity
                   (buildToolchain toolchains)
                   -- FIXME: HACK
                   -- if host and build compiler are the same, we want to get -package-db in here.
                   (corePackageDbs $ if buildIsHost toolchains then Host else Build)
 
+              -- let localPackages' = addCompilerToSourcePkg (compilerId . toolchainCompiler . hostToolchain $ toolchains) localPackages
+
               (sourcePkgDb, tis, ar) <-
                 getSourcePackages
                   verbosity