diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-11-16 22:54:11 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2017-11-18 11:06:45 +0800 |
| commit | 835d8ddbbfb11796ea8a03d1806b7cee38ba17a6 (patch) | |
| tree | 61e7681171e65484e647fc2ddde97bd450051931 /utils | |
| parent | 12a7444463184e9eddbe7b7251a0ee1e976f4d75 (diff) | |
| download | haskell-835d8ddbbfb11796ea8a03d1806b7cee38ba17a6.tar.gz | |
GHC.Prim use virtual-modules
Stop the GHC.Prim madness with `virtual-module` support from cabal.
Needs https://github.com/haskell/cabal/pull/4875.
Bumps submodule libraries/Cabal to include the necessary logic for `virtual-module`.
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D4179
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 9d0ffcff9a..440ab0b7d0 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -145,26 +145,12 @@ doCopy directory distDir else ["--destdir", myDestDir]) ++ args copyHooks = userHooks { - copyHook = noGhcPrimHook - $ modHook False + copyHook = modHook False $ copyHook userHooks } defaultMainWithHooksArgs copyHooks copyArgs where - noGhcPrimHook f pd lbi us flags - = let pd' - | packageName pd == mkPackageName "ghc-prim" = - case library pd of - Just lib -> - let ghcPrim = fromJust (simpleParse "GHC.Prim") - ems = filter (ghcPrim /=) (exposedModules lib) - lib' = lib { exposedModules = ems } - in pd { library = Just lib' } - Nothing -> - error "Expected a library, but none found" - | otherwise = pd - in f pd' lbi us flags modHook relocatableBuild f pd lbi us flags = do let verbosity = normal idts = updateInstallDirTemplates relocatableBuild |