summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2016-08-05 09:52:26 +0200
committerGabor Greif <ggreif@gmail.com>2016-08-05 09:52:26 +0200
commitfe4008f6cc51612c2511cf23fcd646bc23ef91b8 (patch)
tree4a46a9e7f1fb7e716071f9cff13f0c99aa4dbbc0
parent1101045cbdbd6f240fa7e2438d9488822cd604fb (diff)
downloadhaskell-fe4008f6cc51612c2511cf23fcd646bc23ef91b8.tar.gz
Remove identity update of field componentsConfigs
... in LocalBuildInfo, getting rid of a TODO in the process. Turns out that componentsConfigs won't be a field in Cabal 2.0 any more, so this can be seen as a preparation for it.
-rw-r--r--utils/ghc-cabal/Main.hs7
1 files changed, 1 insertions, 6 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 99f34d9e6e..8cc1d1a34a 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -229,12 +229,7 @@ doRegister directory distDir ghc ghcpkg topdir
progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs
instInfos <- dump (hcPkgInfo progs') verbosity GlobalPackageDB
let installedPkgs' = PackageIndex.fromList instInfos
- let updateComponentConfig (clbi, deps)
- = (updateComponentLocalBuildInfo clbi, deps)
- updateComponentLocalBuildInfo clbi = clbi -- TODO: remove
- ccs' = map updateComponentConfig (componentsConfigs lbi)
- lbi' = lbi {
- componentsConfigs = ccs',
+ let lbi' = lbi {
installedPkgs = installedPkgs',
installDirTemplates = idts,
withPrograms = progs'