diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-05-04 14:55:59 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-08-08 14:14:42 -0700 |
| commit | fe19be2de14a5506c1af21dc4d574f5ffd6acbdf (patch) | |
| tree | d0d9b439c53c220278f1f2dc31ea1bec4c31aa46 /utils/ghc-cabal/Main.hs | |
| parent | 4d9c22d01561bda90632d9a470fd2a2bb167658a (diff) | |
| download | haskell-fe19be2de14a5506c1af21dc4d574f5ffd6acbdf.tar.gz | |
Cabal submodule update.
There's a substantial bump to the haddock.Cabal allocation
stats, because we added 50% more modules, so of course allocations
are going to increase 50%. (But perhaps this is indicative of
some bad constant factor in Haddock related to modules.)
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: ggreif, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2442
Diffstat (limited to 'utils/ghc-cabal/Main.hs')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 8cc1d1a34a..b833b640f8 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -1,3 +1,4 @@ +{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} module Main (main) where @@ -150,16 +151,14 @@ doCopy directory distDir noGhcPrimHook f pd lbi us flags = let pd' | packageName pd == PackageName "ghc-prim" = - case libraries pd of - [lib] -> + case library pd of + Just lib -> let ghcPrim = fromJust (simpleParse "GHC.Prim") ems = filter (ghcPrim /=) (exposedModules lib) lib' = lib { exposedModules = ems } - in pd { libraries = [lib'] } - [] -> + in pd { library = Just lib' } + Nothing -> error "Expected a library, but none found" - _ -> - error "Expected a single library, but multiple found" | otherwise = pd in f pd' lbi us flags modHook relocatableBuild f pd lbi us flags @@ -326,7 +325,7 @@ generate directory distdir dll0Modules config_args comp = compiler lbi libBiModules lib = (libBuildInfo lib, libModules lib) exeBiModules exe = (buildInfo exe, ModuleName.main : exeModules exe) - biModuless = (map libBiModules $ libraries pd) + biModuless = (map libBiModules . maybeToList $ library pd) ++ (map exeBiModules $ executables pd) buildableBiModuless = filter isBuildable biModuless where isBuildable (bi', _) = buildable bi' |