diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-07-11 18:42:35 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-04 21:45:49 -0400 |
| commit | 0dded5ecd2f02e13292818ae3729d32832c014f3 (patch) | |
| tree | ad5d985078d94e8bdc4ad5d65be2d052e6dd42c2 /libraries/ghci | |
| parent | eb892b28b92351358dd7cb0ee6b0b1a1d7fcc98e (diff) | |
| download | haskell-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 'libraries/ghci')
| -rw-r--r-- | libraries/ghci/GHCi/BreakArray.hs | 6 | ||||
| -rw-r--r-- | libraries/ghci/GHCi/InfoTable.hsc | 6 | ||||
| -rw-r--r-- | libraries/ghci/ghci.cabal.in | 11 |
3 files changed, 0 insertions, 23 deletions
diff --git a/libraries/ghci/GHCi/BreakArray.hs b/libraries/ghci/GHCi/BreakArray.hs index 41a2ab498f..8ab813a5a7 100644 --- a/libraries/ghci/GHCi/BreakArray.hs +++ b/libraries/ghci/GHCi/BreakArray.hs @@ -19,17 +19,14 @@ module GHCi.BreakArray ( BreakArray -#if defined(HAVE_INTERPRETER) (BA) -- constructor is exported only for ByteCodeGen , newBreakArray , getBreak , setBreakOn , setBreakOff , showBreakArray -#endif ) where -#if defined(HAVE_INTERPRETER) import Prelude -- See note [Why do we import Prelude here?] import Control.Monad import Data.Word @@ -116,6 +113,3 @@ readBA# array i = IO $ \s -> readBreakArray :: BreakArray -> Int -> IO Word8 readBreakArray (BA array) (I# i) = readBA# array i -#else -data BreakArray -#endif diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc index 826e3bc2fd..ab13485e28 100644 --- a/libraries/ghci/GHCi/InfoTable.hsc +++ b/libraries/ghci/GHCi/InfoTable.hsc @@ -10,13 +10,10 @@ -- module GHCi.InfoTable ( -#if defined(HAVE_INTERPRETER) mkConInfoTable -#endif ) where import Prelude -- See note [Why do we import Prelude here?] -#if defined(HAVE_INTERPRETER) import Foreign import Foreign.C import GHC.Ptr @@ -24,7 +21,6 @@ import GHC.Exts import GHC.Exts.Heap import Data.ByteString (ByteString) import qualified Data.ByteString as BS -#endif ghciTablesNextToCode :: Bool #if defined(TABLES_NEXT_TO_CODE) @@ -33,7 +29,6 @@ ghciTablesNextToCode = True ghciTablesNextToCode = False #endif -#if defined(HAVE_INTERPRETER) /* To end */ -- NOTE: Must return a pointer acceptable for use in the header of a closure. -- If tables_next_to_code is enabled, then it must point the the 'code' field. -- Otherwise, it should point to the start of the StgInfoTable. @@ -387,4 +382,3 @@ wORD_SIZE = (#const SIZEOF_HSINT) conInfoTableSizeB :: Int conInfoTableSizeB = wORD_SIZE + itblSize -#endif /* HAVE_INTERPRETER */ diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 4da94b3549..849e2a147a 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -22,11 +22,6 @@ Flag ghci Default: False Manual: True -Flag ext-interp - Description: Build external interpreter support - Default: True - Manual: True - source-repository head type: git location: https://gitlab.haskell.org/ghc/ghc.git @@ -61,12 +56,6 @@ library GHCi.Signals GHCi.TH - if flag(ext-interp) - CPP-Options: -DHAVE_EXTERNAL_INTERPRETER - - if flag(ghci) || flag(ext-interp) - CPP-Options: -DHAVE_INTERPRETER - include-dirs: @FFIIncludeDir@ exposed-modules: |