diff options
| author | Shea Levy <shea@shealevy.com> | 2016-12-17 20:08:58 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-12-17 20:58:35 -0500 |
| commit | 52ba9470a7e85d025dc84a6789aa809cdd68b566 (patch) | |
| tree | eedb856723fb2dc0101b946af3702e6c6aee18da /ghc.mk | |
| parent | e0fe7c3131c4a18ddd9dd9f2afdd46cafc8cd7ae (diff) | |
| download | haskell-52ba9470a7e85d025dc84a6789aa809cdd68b566.tar.gz | |
Allow use of the external interpreter in stage1.
Now that we have -fexternal-interpreter, we can lose most of the GHCI ifdefs.
Reviewers: simonmar, goldfire, austin, hvr, bgamari
Reviewed By: simonmar
Subscribers: RyanGlScott, mpickering, angerman, thomie
Differential Revision: https://phabricator.haskell.org/D2826
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 +PACKAGES_STAGE0 = binary Cabal/Cabal hpc ghc-boot-th ghc-boot hoopl transformers template-haskell ghci ifeq "$(Windows_Host)" "NO" PACKAGES_STAGE0 += terminfo endif @@ -589,6 +589,9 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES_STAGE1),$(libraries/$(lib)_dist-inst endif BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB)) +# Only build internal interpreter support for the stage2 ghci lib +libraries/ghci_dist-install_CONFIGURE_OPTS += --flags=ghci + # ---------------------------------------- # Special magic for the ghc-prim package |