Merge pull request #804 from angerman/patch-1

HAVE_INTERNAL_INTERPRETER fixes
ghcjs · Jun 4, 2021 · ecb5954 · ecb5954
2 parents 36b0286 + 820dfcd
commit ecb5954
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ghcjs.cabal b/ghcjs.cabal
@@ -245,7 +245,7 @@ Library
         CPP-Options: -DDEBUG
 
     if flag(ghci)
-        CPP-Options: -DGHCI
+        CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         -- Include-Dirs: ../rts/dist/build
 
     Other-Extensions:
@@ -1145,4 +1145,3 @@ Flag terminfo
     Description: Build GHC with terminfo support on non-Windows platforms.
     Default: True
     Manual: True
-
diff --git a/lib/ghc/ghc.cabal.in b/lib/ghc/ghc.cabal.in
@@ -68,7 +68,7 @@ Library
     GHC-Options: -Wall -fno-warn-name-shadowing
 
     if flag(ghci)
-        CPP-Options: -DGHCI
+        CPP-Options: -DHAVE_INTERNAL_INTERPRETER
 --        Include-Dirs: ../rts/dist/build
 
     Other-Extensions:

diff --git a/src/Compiler/Program.hs b/src/Compiler/Program.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE CPP, NondecreasingIndentation, TupleSections, LambdaCase #-}
 -- GHC frontend ( ghc/Main.hs ) adapted for GHCJS
 #undef GHCI
+#undef HAVE_INTERNAL_INTERPRETER
 
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 

diff --git a/utils/pkg-input/ghci-ghcjs/ghci-ghcjs.cabal b/utils/pkg-input/ghci-ghcjs/ghci-ghcjs.cabal
@@ -47,7 +47,7 @@ library
         UnboxedTuples
 
     if flag(ghci)
-        CPP-Options: -DGHCI
+        CPP-Options: -DHAVE_INTERNAL_INTERPRETER
         exposed-modules:
             GHCi.Run
             GHCi.CreateBCO