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 /compiler/ghc.cabal.in | |
| 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 'compiler/ghc.cabal.in')
| -rw-r--r-- | compiler/ghc.cabal.in | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 4875753a1c..99bb463f54 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -64,6 +64,7 @@ Library transformers == 0.5.*, ghc-boot == @ProjectVersionMunged@, ghc-boot-th == @ProjectVersionMunged@, + ghci == @ProjectVersionMunged@, hoopl >= 3.10.2 && < 3.11 if os(windows) @@ -73,9 +74,6 @@ Library Build-Depends: terminfo == 0.4.* Build-Depends: unix == 2.7.* - if flag(ghci) - Build-Depends: ghci == @ProjectVersionMunged@ - GHC-Options: -Wall -fno-warn-name-shadowing if flag(ghci) @@ -605,16 +603,6 @@ Library Dwarf Dwarf.Types Dwarf.Constants - - if !flag(stage1) - -- ghc:Serialized moved to ghc-boot:GHC.Serialized. So for - -- compatibility with GHC 7.10 and earlier, we reexport it - -- under the old name. - reexported-modules: - ghc-boot:GHC.Serialized as Serialized - - if flag(ghci) - Exposed-Modules: Convert ByteCodeTypes ByteCodeAsm @@ -627,3 +615,10 @@ Library RtClosureInspect DebuggerUtils GHCi + + if !flag(stage1) + -- ghc:Serialized moved to ghc-boot:GHC.Serialized. So for + -- compatibility with GHC 7.10 and earlier, we reexport it + -- under the old name. + reexported-modules: + ghc-boot:GHC.Serialized as Serialized |