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 /ghc.mk | |
| 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 'ghc.mk')
| -rw-r--r-- | ghc.mk | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -598,15 +598,9 @@ libraries/ghci_dist-install_CONFIGURE_OPTS += --flags=ghci # We want the ghc-prim package to include the GHC.Prim module when it # is registered, but not when it is built, because GHC.Prim is not a -# real source module, it is built-in to GHC. The old build system did -# this using Setup.hs, but we can't do that here, so we have a flag to -# enable GHC.Prim in the .cabal file (so that the ghc-prim package -# remains compatible with the old build system for the time being). -# GHC.Prim module in the ghc-prim package with a flag: -# -libraries/ghc-prim_CONFIGURE_OPTS += --flag=include-ghc-prim +# real source module, it is built-in to GHC. -# And then we strip it out again before building the package: +# Strip it out again before building the package: define libraries/ghc-prim_PACKAGE_MAGIC libraries/ghc-prim_dist-install_MODULES := $$(filter-out GHC.Prim,$$(libraries/ghc-prim_dist-install_MODULES)) endef |