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 /compiler/ghci/ByteCodeInstr.hs | |
| 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 'compiler/ghci/ByteCodeInstr.hs')
| -rw-r--r-- | compiler/ghci/ByteCodeInstr.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/ghci/ByteCodeInstr.hs b/compiler/ghci/ByteCodeInstr.hs index f1f6f70e57..43444321de 100644 --- a/compiler/ghci/ByteCodeInstr.hs +++ b/compiler/ghci/ByteCodeInstr.hs @@ -30,7 +30,11 @@ import PrimOp import SMRep import Data.Word +#if MIN_VERSION_base(4,9,0) import GHC.Stack.CCS (CostCentre) +#else +import GHC.Stack (CostCentre) +#endif -- ---------------------------------------------------------------------------- -- Bytecode instructions |