Teo Camarasu pushed to branch wip/T26226 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Driver/Downsweep.hs
    ... ... @@ -1010,7 +1010,7 @@ enableCodeGenWhen logger tmpfs staticLife dynLife unit_env mod_graph = do
    1010 1010
         -- #16331 - when no "internal interpreter" is available but we
    
    1011 1011
         -- need to process some TemplateHaskell or QuasiQuotes, we automatically
    
    1012 1012
         -- turn on -fexternal-interpreter.
    
    1013
    -    ext_interp_enable ms = not ghciSupported && internalInterpreter
    
    1013
    +    ext_interp_enable ms = not internalInterpreterSupported && internalInterpreter
    
    1014 1014
           where
    
    1015 1015
            lcl_dflags   = ms_hspp_opts ms
    
    1016 1016
            internalInterpreter = not (gopt Opt_ExternalInterpreter lcl_dflags)
    

  • compiler/GHC/Utils/Constants.hs
    ... ... @@ -2,7 +2,7 @@
    2 2
     
    
    3 3
     module GHC.Utils.Constants
    
    4 4
       ( debugIsOn
    
    5
    -  , ghciSupported
    
    5
    +  , internalInterpreterSupported
    
    6 6
       , isWindowsHost
    
    7 7
       , isDarwinHost
    
    8 8
       )
    
    ... ... @@ -22,11 +22,11 @@ branch of the conditional, thereby dropping debug code altogether when
    22 22
     the flags are off.
    
    23 23
     -}
    
    24 24
     
    
    25
    -ghciSupported :: Bool
    
    25
    +internalInterpreterSupported :: Bool
    
    26 26
     #if defined(HAVE_INTERNAL_INTERPRETER)
    
    27
    -ghciSupported = True
    
    27
    +internalInterpreterSupported = True
    
    28 28
     #else
    
    29
    -ghciSupported = False
    
    29
    +internalInterpreterSupported = False
    
    30 30
     #endif
    
    31 31
     
    
    32 32
     debugIsOn :: Bool