summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorMichal Terepeta <michal.terepeta@gmail.com>2017-06-23 11:41:50 -0400
committerBen Gamari <ben@smart-cactus.org>2017-06-23 13:07:30 -0400
commit42eee6eac3d4bf4b2b557cdc13f2d5acae93d4e8 (patch)
tree68a7bfe0f71a983784afb6c3ba1fcfdbaf62a546 /ghc.mk
parent9077120918b78f5152bf3596fe6df07b91cead79 (diff)
downloadhaskell-42eee6eac3d4bf4b2b557cdc13f2d5acae93d4e8.tar.gz
Hoopl: remove dependency on Hoopl package
This copies the subset of Hoopl's functionality needed by GHC to `cmm/Hoopl` and removes the dependency on the Hoopl package. The main motivation for this change is the confusing/noisy interface between GHC and Hoopl: - Hoopl has `Label` which is GHC's `BlockId` but different than GHC's `CLabel` - Hoopl has `Unique` which is different than GHC's `Unique` - Hoopl has `Unique{Map,Set}` which are different than GHC's `Uniq{FM,Set}` - GHC has its own specialized copy of `Dataflow`, so `cmm/Hoopl` is needed just to filter the exposed functions (filter out some of the Hoopl's and add the GHC ones) With this change, we'll be able to simplify this significantly. It'll also be much easier to do invasive changes (Hoopl is a public package on Hackage with users that depend on the current behavior) This should introduce no changes in functionality - it merely copies the relevant code. Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com> Test Plan: ./validate Reviewers: austin, bgamari, simonmar Reviewed By: bgamari, simonmar Subscribers: simonpj, kavon, rwbarton, thomie Differential Revision: https://phabricator.haskell.org/D3616
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/ghc.mk b/ghc.mk
index 3fafcf0ac9..cdab331486 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -430,7 +430,7 @@ else # CLEANING
# programs such as GHC and ghc-pkg, that we do not assume the stage0
# compiler already has installed (or up-to-date enough).
-PACKAGES_STAGE0 = binary Cabal/Cabal hpc ghc-boot-th ghc-boot hoopl transformers template-haskell ghci
+PACKAGES_STAGE0 = binary Cabal/Cabal hpc ghc-boot-th ghc-boot transformers template-haskell ghci
ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE0 += terminfo
endif
@@ -461,7 +461,6 @@ PACKAGES_STAGE1 += Cabal/Cabal
PACKAGES_STAGE1 += ghc-boot-th
PACKAGES_STAGE1 += ghc-boot
PACKAGES_STAGE1 += template-haskell
-PACKAGES_STAGE1 += hoopl
PACKAGES_STAGE1 += transformers
PACKAGES_STAGE1 += ghc-compact