diff options
| author | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
| commit | f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12 (patch) | |
| tree | b14692ca8e33e8f925a1fa47542eb3499fc79f0e /compiler/ghc.cabal.in | |
| parent | bb74bc79daf8b91b21a1b68b0a406828d188ed92 (diff) | |
| download | haskell-f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12.tar.gz | |
Revert "Allow use of the external interpreter in stage1."
This reverts commit 52ba9470a7e85d025dc84a6789aa809cdd68b566.
Diffstat (limited to 'compiler/ghc.cabal.in')
| -rw-r--r-- | compiler/ghc.cabal.in | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 99bb463f54..4875753a1c 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -64,7 +64,6 @@ Library transformers == 0.5.*, ghc-boot == @ProjectVersionMunged@, ghc-boot-th == @ProjectVersionMunged@, - ghci == @ProjectVersionMunged@, hoopl >= 3.10.2 && < 3.11 if os(windows) @@ -74,6 +73,9 @@ 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) @@ -603,6 +605,16 @@ 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 @@ -615,10 +627,3 @@ 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 |