diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-18 23:15:03 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-18 23:15:03 +0100 |
| commit | 4c02b6f5dc4385369aa62160acd6037a32922f84 (patch) | |
| tree | 32e459480b17e772d25061b12efe4a3a7e206e13 /utils/ghc-cabal/Main.hs | |
| parent | 989831d41d1e47795aa3cba45e580511e0590b18 (diff) | |
| download | haskell-4c02b6f5dc4385369aa62160acd6037a32922f84.tar.gz | |
Update Cabal submodule to 1.22 version
Diffstat (limited to 'utils/ghc-cabal/Main.hs')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 8729fd42be..6724f3ae52 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -10,6 +10,7 @@ import Distribution.System import Distribution.Simple import Distribution.Simple.Configure import Distribution.Simple.LocalBuildInfo +import Distribution.Simple.GHC import Distribution.Simple.Program import Distribution.Simple.Program.HcPkg import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag) @@ -224,8 +225,7 @@ doRegister directory distDir ghc ghcpkg topdir configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs - let Just ghcPkgProg = lookupProgram ghcPkgProgram' progs' - instInfos <- dump verbosity ghcPkgProg GlobalPackageDB + instInfos <- dump (hcPkgInfo progs') verbosity GlobalPackageDB let installedPkgs' = PackageIndex.fromList instInfos let updateComponentConfig (cn, clbi, deps) = (cn, updateComponentLocalBuildInfo clbi, deps) |