diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-09-30 16:50:52 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-10-02 14:31:00 -0700 |
| commit | 22c6b7f2e5265461128e3a19a01d07341fb29498 (patch) | |
| tree | 9397166afbd52e16383395908ae529e848d5831d /utils/ghc-cabal | |
| parent | eda5a4ab6c2032ec13d9cd0aac258bb14f0b2ec9 (diff) | |
| download | haskell-22c6b7f2e5265461128e3a19a01d07341fb29498.tar.gz | |
Update Cabal submodule to latest version.
Summary:
Note that Cabal needs one more bugfix which is in PR to
fix GHC bootstrapping. But the rest of the patch is
ready for review.
Needs a filepath submodule update because cabal check
became more strict.
This patch handles the abstract-ification of Version and
PackageName.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: bgamari, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2555
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index b833b640f8..e72e46cc99 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -150,7 +150,7 @@ doCopy directory distDir where noGhcPrimHook f pd lbi us flags = let pd' - | packageName pd == PackageName "ghc-prim" = + | packageName pd == mkPackageName "ghc-prim" = case library pd of Just lib -> let ghcPrim = fromJust (simpleParse "GHC.Prim") @@ -312,7 +312,7 @@ generate directory distdir dll0Modules config_args do cwd <- getCurrentDirectory let ipid = mkUnitId (display (packageId pd)) let installedPkgInfo = inplaceInstalledPackageInfo cwd distdir - pd (AbiHash "") lib lbi clbi + pd (mkAbiHash "") lib lbi clbi final_ipi = mangleIPI directory distdir lbi $ installedPkgInfo { Installed.installedUnitId = ipid, Installed.compatPackageKey = display (packageId pd), @@ -350,7 +350,7 @@ generate directory distdir dll0Modules config_args -- stricter than gnu ld). Thus we remove the ldOptions for -- GHC's rts package: hackRtsPackage index = - case PackageIndex.lookupPackageName index (PackageName "rts") of + case PackageIndex.lookupPackageName index (mkPackageName "rts") of [(_,[rts])] -> PackageIndex.insert rts{ Installed.ldOptions = [], |