summaryrefslogtreecommitdiff
path: root/ghc/ghc-bin.cabal.in
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-07-11 18:42:35 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-04 21:45:49 -0400
commit0dded5ecd2f02e13292818ae3729d32832c014f3 (patch)
treead5d985078d94e8bdc4ad5d65be2d052e6dd42c2 /ghc/ghc-bin.cabal.in
parenteb892b28b92351358dd7cb0ee6b0b1a1d7fcc98e (diff)
downloadhaskell-0dded5ecd2f02e13292818ae3729d32832c014f3.tar.gz
Always enable the external interpreter
You can always just not use or even build `iserv`. I don't think the maintenance cost of the CPP is worth...I can't even tell what the benefit is.
Diffstat (limited to 'ghc/ghc-bin.cabal.in')
-rw-r--r--ghc/ghc-bin.cabal.in15
1 files changed, 2 insertions, 13 deletions
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index cf5fde03e3..721df4ea62 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -24,11 +24,6 @@ Flag ghci
Default: False
Manual: True
-Flag ext-interp
- Description: Build external interpreter support
- Default: True
- Manual: True
-
Flag threaded
Description: Link the ghc executable against the threaded RTS
Default: True
@@ -44,6 +39,7 @@ Executable ghc
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
filepath >= 1 && < 1.5,
+ transformers == 0.5.*,
ghc-boot == @ProjectVersionMunged@,
ghc == @ProjectVersionMunged@
@@ -66,8 +62,7 @@ Executable ghc
ghc-prim >= 0.5.0 && < 0.7,
ghci == @ProjectVersionMunged@,
haskeline == 0.7.*,
- time >= 1.8 && < 1.10,
- transformers == 0.5.*
+ time >= 1.8 && < 1.10
CPP-Options: -DHAVE_INTERNAL_INTERPRETER
GHC-Options: -fno-warn-name-shadowing
Other-Modules:
@@ -97,12 +92,6 @@ Executable ghc
if flag(threaded)
ghc-options: -threaded
- if flag(ext-interp)
- cpp-options: -DHAVE_EXTERNAL_INTERPRETER
-
- if flag(ghci) || flag(ext-interp)
- cpp-options: -DHAVE_INTERPRETER
-
Other-Extensions:
CPP
NondecreasingIndentation