use the correct packagedb for setup

Author: andreabedini

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

@@ -2233,6 +2233,11 @@ elaborateInstallPlan
               } =
           elaboratedPackage
           where
+            compilers = fmap toolchainCompiler toolchains
+            platforms = fmap toolchainPlatform toolchains
+            programDbs = fmap toolchainProgramDb toolchains
+            packageDbs = fmap toolchainPackageDBs toolchains
+
             elaboratedPackage = ElaboratedConfiguredPackage{..}
 
             -- These get filled in later
@@ -2246,10 +2251,10 @@ elaborateInstallPlan
             elabPkgSourceId = srcpkgPackageId
 
             elabStage = solverPkgStage
-            elabCompiler = toolchainCompiler (getStage toolchains solverPkgStage)
-            elabPlatform = toolchainPlatform (getStage toolchains solverPkgStage)
-            elabProgramDb = toolchainProgramDb (getStage toolchains solverPkgStage)
-            elabPackageDbs = toolchainPackageDBs (getStage toolchains solverPkgStage)
+            elabCompiler = getStage compilers solverPkgStage
+            elabPlatform = getStage platforms solverPkgStage
+            elabProgramDb = getStage programDbs solverPkgStage
+            elabPackageDbs = getStage packageDbs solverPkgStage
 
             elabPkgDescription = case PD.finalizePD
               solverPkgFlags
@@ -2319,8 +2324,8 @@ elaborateInstallPlan
                 then BuildInplaceOnly OnDisk
                 else BuildAndInstall
 
-            elabBuildPackageDBStack = buildAndRegisterDbs
-            elabRegisterPackageDBStack = buildAndRegisterDbs
+            elabBuildPackageDBStack = buildAndRegisterDbs elabStage
+            elabRegisterPackageDBStack = buildAndRegisterDbs elabStage
 
             elabSetupScriptStyle = packageSetupScriptStyle elabPkgDescription
             elabSetupScriptCliVersion =
@@ -2329,21 +2334,18 @@ elaborateInstallPlan
                 elabPkgDescription
                 libDepGraph
                 solverPkgLibDeps
-            elabSetupPackageDBStack = buildAndRegisterDbs
-
-            inplacePackageDbs = corePackageDbs ++ [distPackageDB (compilerId elabCompiler)]
+            elabSetupPackageDBStack = buildAndRegisterDbs (prevStage elabStage)
 
-            corePackageDbs =
-              Cabal.interpretPackageDbFlags False (projectConfigPackageDBs (projectConfigToolchain sharedPackageConfig))
-              ++ [storePackageDB storeDirLayout elabCompiler]
+            inplacePackageDbs stage = corePackageDbs stage ++ [distPackageDB (compilerId (getStage compilers stage))]
+            corePackageDbs stage = getStage packageDbs stage ++ [storePackageDB storeDirLayout (getStage compilers stage)]
 
-            elabInplaceBuildPackageDBStack = inplacePackageDbs
-            elabInplaceRegisterPackageDBStack = inplacePackageDbs
-            elabInplaceSetupPackageDBStack = inplacePackageDbs
+            elabInplaceBuildPackageDBStack = inplacePackageDbs elabStage
+            elabInplaceRegisterPackageDBStack = inplacePackageDbs elabStage
+            elabInplaceSetupPackageDBStack = inplacePackageDbs (prevStage elabStage)
 
-            buildAndRegisterDbs
-              | shouldBuildInplaceOnly pkg = inplacePackageDbs
-              | otherwise = corePackageDbs
+            buildAndRegisterDbs stage
+              | shouldBuildInplaceOnly pkg = inplacePackageDbs stage
+              | otherwise = corePackageDbs stage
 
             elabPkgDescriptionOverride = srcpkgDescrOverride
 
@@ -3936,7 +3938,7 @@ setupHsScriptOptions
     where
       Toolchain{toolchainCompiler, toolchainPlatform, toolchainProgramDb} =
         -- TODO: It is disappointing that we have to change the stage here
-        getStage pkgConfigToolchains (Stage.prevStage elabStage)
+        getStage pkgConfigToolchains (prevStage elabStage)
 
 -- | To be used for the input for elaborateInstallPlan.
 --
@@ -3954,7 +3956,7 @@ storePackageInstallDirs
   :: StoreDirLayout
   -> Compiler
   -> InstalledPackageId
-  -> InstallDirs.InstallDirs FilePath
+  -> InstallDirs.InstallDirs FilePath 
 storePackageInstallDirs storeDirLayout compiler ipkgid =
   storePackageInstallDirs' storeDirLayout compiler $ newSimpleUnitId ipkgid