diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2017-04-26 15:26:56 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-26 15:27:29 -0400 |
| commit | 579bb7669f40ed01841dd197ee535cf26fa19580 (patch) | |
| tree | bbc8f776648cda12537d10a8f747e6e91dbe74ef /utils | |
| parent | 350d268aa62543097d8ae3f81a7adf0d635d6688 (diff) | |
| download | haskell-579bb7669f40ed01841dd197ee535cf26fa19580.tar.gz | |
Update Cabal submodule, with necessary wibbles.
Test Plan: validate
Reviewers: bgamari, austin
Reviewed By: bgamari
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3501
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 3 | ||||
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 608517ea8b..8a1c2c1755 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -20,6 +20,7 @@ import Distribution.Simple.Utils (defaultPackageDesc, writeFileAtomic, toUTF8) import Distribution.Simple.Build (writeAutogenFiles) import Distribution.Simple.Register import Distribution.Text +import Distribution.Types.MungedPackageId import Distribution.Verbosity import qualified Distribution.InstalledPackageInfo as Installed import qualified Distribution.Simple.PackageIndex as PackageIndex @@ -383,7 +384,7 @@ generate directory distdir dll0Modules config_args depLibNames | packageKeySupported comp = dep_ipids | otherwise = deps - depNames = map (display . packageName) dep_ids + depNames = map (display . mungedName) dep_ids transitive_dep_ids = map Installed.sourcePackageId dep_pkgs transitiveDeps = map display transitive_dep_ids diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index ed73c2960b..9e18c97bc1 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1236,16 +1236,9 @@ convertPackageInfoToCacheFormat pkg = GhcPkg.componentId = installedComponentId pkg, GhcPkg.instantiatedWith = instantiatedWith pkg, GhcPkg.sourcePackageId = sourcePackageId pkg, - GhcPkg.packageName = - case sourcePackageName pkg of - Nothing -> packageName pkg - Just pn -> pn, + GhcPkg.packageName = packageName pkg, GhcPkg.packageVersion = Version.Version (versionNumbers (packageVersion pkg)) [], - GhcPkg.mungedPackageName = - case sourcePackageName pkg of - Nothing -> Nothing - Just _ -> Just (packageName pkg), - GhcPkg.libName = + GhcPkg.sourceLibName = fmap (mkPackageName . unUnqualComponentName) (sourceLibName pkg), GhcPkg.depends = depends pkg, GhcPkg.abiDepends = map (\(AbiDependency k v) -> (k,unAbiHash v)) (abiDepends pkg), |