X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=80f85fa67d1528398afb5a3fb676db25713cd7d4;hb=d1545b69b5fbcad3a95b86d9da389235da832b6d;hp=cd11e0f361971c6e10f3ec76726bc64439e0dc87;hpb=abf158bf9c7c076a1cb560ffa5309e840b09e384;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index cd11e0f..80f85fa 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -171,10 +171,10 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do = do stub_o <- compileStub dflags' this_mod location return [ DotO stub_o ] - handleMake (HscNoRecomp, iface, details) + handleBatch (HscNoRecomp, iface, details) = ASSERT (isJust maybe_old_linkable) return (CompOK details iface maybe_old_linkable) - handleMake (HscRecomp hasStub, iface, details) + handleBatch (HscRecomp hasStub, iface, details) | isHsBoot src_flavour = return (CompOK details iface Nothing) | otherwise @@ -223,8 +223,10 @@ compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do HscInterpreted | not (isHsBoot src_flavour) -- We can't compile boot files to -- bytecode so don't even try. -> runCompiler hscCompileInteractive handleInterpreted + HscNothing + -> runCompiler hscCompileNothing handleBatch _other - -> runCompiler hscCompileMake handleMake + -> runCompiler hscCompileBatch handleBatch ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support)