diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-09-15 12:47:29 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-16 04:55:17 -0400 |
| commit | 8af954d202de1de0671062c3f55e43fc783f8192 (patch) | |
| tree | f8cf8e949e2c4d42ea36c696ded1a1c360bf35d5 | |
| parent | b695e7d73617ab19170d37b383315e8ede289c5e (diff) | |
| download | haskell-8af954d202de1de0671062c3f55e43fc783f8192.tar.gz | |
Make ghc-boot reexport modules from ghc-boot-th
Packages don't have to import both ghc-boot and ghc-boot-th. It makes
the dependency graph easier to understand and to refactor.
| -rw-r--r-- | compiler/ghc.cabal.in | 1 | ||||
| -rw-r--r-- | libraries/ghc-boot/ghc-boot.cabal.in | 8 | ||||
| -rw-r--r-- | libraries/ghci/ghci.cabal.in | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 7694cfa2ec..d469a85926 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -72,7 +72,6 @@ Library transformers == 0.5.*, exceptions == 0.10.*, ghc-boot == @ProjectVersionMunged@, - ghc-boot-th == @ProjectVersionMunged@, ghc-heap == @ProjectVersionMunged@, ghci == @ProjectVersionMunged@ diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index ddefca51db..1d70a65646 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -49,6 +49,14 @@ Library GHC.UniqueSubdir GHC.Version + -- reexport modules from ghc-boot-th so that packages don't have to import + -- both ghc-boot and ghc-boot-th. It makes the dependency graph easier to + -- understand and to refactor. + reexported-modules: + GHC.LanguageExtensions.Type + , GHC.ForeignSrcLang.Type + , GHC.Lexeme + -- but done by Hadrian -- autogen-modules: -- GHC.Version diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 1661bf213a..60330f72b6 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -79,7 +79,6 @@ library deepseq == 1.4.*, filepath == 1.4.*, ghc-boot == @ProjectVersionMunged@, - ghc-boot-th == @ProjectVersionMunged@, ghc-heap == @ProjectVersionMunged@, template-haskell == 2.17.*, transformers == 0.5.* |