diff options
| author | Shea Levy <shea@shealevy.com> | 2016-12-20 01:19:18 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-12-20 01:25:48 +0000 |
| commit | 27f79255634d9789f367273504545c1ebfad90a0 (patch) | |
| tree | 9d2977cd52f18abcc824dae743ec7c4a3e6f04c0 /ghc.mk | |
| parent | c0c1f801f4ca26f1db68ac527341a1cf051cb7d6 (diff) | |
| download | haskell-27f79255634d9789f367273504545c1ebfad90a0.tar.gz | |
Allow use of the external interpreter in stage1.
Summary:
Now that we have -fexternal-interpreter, we can lose most of the GHCI ifdefs.
This was originally added in https://phabricator.haskell.org/D2826
but that led to a compatibility issue with ghc 7.10.x on Windows.
That's fixed here and the revert reverted.
Reviewers: goldfire, hvr, austin, bgamari, Phyx
Reviewed By: Phyx
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2884
GHC Trac Issues: #13008
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 |