diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-02 09:55:58 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-02 09:59:49 +0000 |
| commit | 0932bf472fc96bd021e46be9f0e818d47280d995 (patch) | |
| tree | 3f4ffba6afc39b6cdbecc1b74cbdc5d024cd7c4b | |
| parent | d734ef8f78203b856dcfaf19eaebfed6ec623850 (diff) | |
| download | haskell-0932bf472fc96bd021e46be9f0e818d47280d995.tar.gz | |
Replace ad-hoc CPP with constant from GHC.Utils.Constantwip/no-ad-hoc-cpp
Fixes #21154
| -rw-r--r-- | compiler/GHC/Driver/Make.hs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs index 3059154ff5..1a7331e98b 100644 --- a/compiler/GHC/Driver/Make.hs +++ b/compiler/GHC/Driver/Make.hs @@ -15,7 +15,6 @@ {-# LANGUAGE TupleSections #-} {-# LANGUAGE ApplicativeDo #-} {-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE RecordWildCards #-} -- ----------------------------------------------------------------------------- @@ -151,7 +150,7 @@ import Control.Concurrent.STM import Control.Monad.Trans.Maybe import GHC.Runtime.Loader import GHC.Rename.Names - +import GHC.Utils.Constants -- ----------------------------------------------------------------------------- -- Loading the program @@ -1741,14 +1740,9 @@ enableCodeGenWhen logger tmpfs staticLife dynLife unit_env mod_graph = -- #16331 - when no "internal interpreter" is available but we -- need to process some TemplateHaskell or QuasiQuotes, we automatically -- turn on -fexternal-interpreter. - ext_interp_enable ms = not host_internalInterpreter && internalInterpreter + ext_interp_enable ms = not ghciSupported && internalInterpreter where lcl_dflags = ms_hspp_opts ms -#if defined(HAVE_INTERNAL_INTERPRETER) - host_internalInterpreter = True -#else - host_internalInterpreter = False -#endif internalInterpreter = not (gopt Opt_ExternalInterpreter lcl_dflags) |