Commit 330e3bb7 authored by Simon Marlow's avatar Simon Marlow

don't generate .hi-boot/.o-boot files in GHCi

parent 423ed147
...@@ -163,7 +163,8 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do ...@@ -163,7 +163,8 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do
return (CompOK details iface maybe_old_linkable) return (CompOK details iface maybe_old_linkable)
handleBatch (HscRecomp hasStub, iface, details) handleBatch (HscRecomp hasStub, iface, details)
| isHsBoot src_flavour | isHsBoot src_flavour
= do SysTools.touch dflags' "Touching object file" = do when (isObjectTarget hsc_lang) $ -- interpreted reaches here too
SysTools.touch dflags' "Touching object file"
object_filename object_filename
return (CompOK details iface Nothing) return (CompOK details iface Nothing)
| otherwise | otherwise
...@@ -211,13 +212,11 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do ...@@ -211,13 +212,11 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do
Just result -> handle result Just result -> handle result
-- run the compiler -- run the compiler
case hsc_lang of case hsc_lang of
HscInterpreted | not (isHsBoot src_flavour) -- We can't compile boot files to HscInterpreted
-- bytecode so don't even try. | isHsBoot src_flavour -> runCompiler hscCompileNothing handleBatch
-> runCompiler hscCompileInteractive handleInterpreted | otherwise -> runCompiler hscCompileInteractive handleInterpreted
HscNothing HscNothing -> runCompiler hscCompileNothing handleBatch
-> runCompiler hscCompileNothing handleBatch _other -> runCompiler hscCompileBatch handleBatch
_other
-> runCompiler hscCompileBatch handleBatch
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- stub .h and .c files (for foreign export support) -- stub .h and .c files (for foreign export support)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment