diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2023-01-12 10:11:58 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-02-17 15:59:16 -0500 |
| commit | a203ad854ffee802e6bf0aca26e6c9a99bec3865 (patch) | |
| tree | 0340d9fa199490961e97ea24c6574077f37f0d7b /hadrian/src/Rules | |
| parent | be0b7209c6aef22798fc4ba7baacd2099b5cb494 (diff) | |
| download | haskell-a203ad854ffee802e6bf0aca26e6c9a99bec3865.tar.gz | |
Merge libiserv with ghci
`libiserv` serves no purpose. As it depends on `ghci` and doesn't have
more dependencies than the `ghci` package, its code could live in the
`ghci` package too.
This commit also moves most of the code from the `iserv` program into
the `ghci` package as well so that it can be reused. This is especially
useful for the implementation of TH for the JS backend (#22261, !9779).
Diffstat (limited to 'hadrian/src/Rules')
| -rw-r--r-- | hadrian/src/Rules/Documentation.hs | 1 | ||||
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/hadrian/src/Rules/Documentation.hs b/hadrian/src/Rules/Documentation.hs index 27aece61d2..c982642b32 100644 --- a/hadrian/src/Rules/Documentation.hs +++ b/hadrian/src/Rules/Documentation.hs @@ -76,7 +76,6 @@ needDocDeps = do [ ghcBoot , ghcBootTh , ghci - , libiserv , compiler , ghcHeap , templateHaskell diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index e6e5ecd96b..fbd6f8d9aa 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -326,7 +326,6 @@ templateRules = do templateRule "driver/ghci/ghci-wrapper.cabal" $ projectVersion templateRule "ghc/ghc-bin.cabal" $ projectVersion templateRule "utils/iserv/iserv.cabal" $ projectVersion - templateRule "utils/iserv-proxy/iserv-proxy.cabal" $ projectVersion templateRule "utils/remote-iserv/remote-iserv.cabal" $ projectVersion templateRule "utils/runghc/runghc.cabal" $ projectVersion templateRule "libraries/ghc-boot/ghc-boot.cabal" $ projectVersion @@ -334,7 +333,6 @@ templateRules = do templateRule "libraries/ghci/ghci.cabal" $ projectVersion templateRule "libraries/ghc-heap/ghc-heap.cabal" $ projectVersion templateRule "utils/ghc-pkg/ghc-pkg.cabal" $ projectVersion - templateRule "libraries/libiserv/libiserv.cabal" $ projectVersion templateRule "libraries/template-haskell/template-haskell.cabal" $ projectVersion templateRule "libraries/prologue.txt" $ packageVersions |