summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlp Mestanogullari <alpmestan@gmail.com>2019-05-03 10:21:44 +0000
committerBen Gamari <ben@well-typed.com>2019-06-03 23:41:36 -0400
commit07131494e77f4c985c2cef369238dc8e83a98a90 (patch)
tree1356389da47ca7eaad92c3a82b60e44692677aa3
parent605869c7b776ce6071a31ff447998b081e0354ed (diff)
downloadhaskell-cherry-pick-e172a6d1.tar.gz
Enable external interpreter when TH is requested but no internal interpreter is availablecherry-pick-e172a6d1
(cherry picked from commit e172a6d127a65b945b31306ff7b6c43320debfb4)
-rw-r--r--compiler/main/DriverPipeline.hs11
1 files changed, 9 insertions, 2 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 5fe2362973..2c1f0a7ab6 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -258,16 +258,23 @@ compileOne' m_tc_result mHscMessage
then gopt_set dflags0 Opt_BuildDynamicToo
else dflags0
+ -- #16331 - when no "internal interpreter" is available but we
+ -- need to process some TemplateHaskell or QuasiQuotes, we automatically
+ -- turn on -fexternal-interpreter.
+ dflags2 = if not internalInterpreter && needsLinker
+ then gopt_set dflags1 Opt_ExternalInterpreter
+ else dflags1
+
basename = dropExtension input_fn
-- We add the directory in which the .hs files resides) to the import
-- path. This is needed when we try to compile the .hc file later, if it
-- imports a _stub.h file that we created here.
current_dir = takeDirectory basename
- old_paths = includePaths dflags1
+ old_paths = includePaths dflags2
!prevailing_dflags = hsc_dflags hsc_env0
dflags =
- dflags1 { includePaths = addQuoteInclude old_paths [current_dir]
+ dflags2 { includePaths = addQuoteInclude old_paths [current_dir]
, log_action = log_action prevailing_dflags }
-- use the prevailing log_action / log_finaliser,
-- not the one cached in the summary. This is so