From f2b2ab7c11541fecef81bd9f954d7ff33002c485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber=20=28dxld=29?= <dxld@darkboxed.org>
Date: Thu, 22 Aug 2019 17:29:19 +0200
Subject: [PATCH] Merge pull request #6195 from DanielG/fix-v2-install-progdb
Fix v2-install ProgramDb confusion
(cherry picked from commit a7a9766a29aa8181cab15a72880603d3825d8fe3)
---
cabal-install/Distribution/Client/CmdInstall.hs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cabal-install/Distribution/Client/CmdInstall.hs b/cabal-install/Distribution/Client/CmdInstall.hs
index 4402f02019..cf27df1d57 100644
--- a/cabal-install/Distribution/Client/CmdInstall.hs
+++ b/cabal-install/Distribution/Client/CmdInstall.hs
@@ -442,7 +442,8 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
hcPath = flagToMaybe projectConfigHcPath
hcPkg = flagToMaybe projectConfigHcPkg
- progDb =
+ -- ProgramDb with directly user specified paths
+ preProgDb =
userSpecifyPaths (Map.toList (getMapLast packageConfigProgramPaths))
. userSpecifyArgss (Map.toList (getMapMappend packageConfigProgramArgs))
. modifyProgramSearchPath
@@ -450,9 +451,10 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
| dir <- fromNubList packageConfigProgramPathExtra ])
$ defaultProgramDb
+ -- progDb is a program database with compiler tools configured properly
(compiler@Compiler { compilerId =
- compilerId@(CompilerId compilerFlavor compilerVersion) }, platform, progDb') <-
- configCompilerEx hcFlavor hcPath hcPkg progDb verbosity
+ compilerId@(CompilerId compilerFlavor compilerVersion) }, platform, progDb) <-
+ configCompilerEx hcFlavor hcPath hcPkg preProgDb verbosity
let
globalEnv name =
@@ -499,7 +501,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
cabalLayout = mkCabalDirLayout cabalDir mstoreDir mlogsDir
packageDbs = storePackageDBStack (cabalStoreDirLayout cabalLayout) compilerId
- installedIndex <- getInstalledPackages verbosity compiler packageDbs progDb'
+ installedIndex <- getInstalledPackages verbosity compiler packageDbs progDb
let (envSpecs, envEntries') = environmentFileToSpecifiers installedIndex envEntries
--
GitLab