diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-26 21:09:46 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-26 21:36:04 +0100 |
| commit | cee55b9e9b4396f68c787d573007999e4588a558 (patch) | |
| tree | 8c900b30904dcf677ddbf45d28e40ace737814a9 /compiler/main/DriverPipeline.hs | |
| parent | 4ae3def26ff935349bd03bdf0a51bd9377fc6315 (diff) | |
| download | haskell-cee55b9e9b4396f68c787d573007999e4588a558.tar.gz | |
Remove DynFlags's hscOutName field
We now just pass the output filename as an argument instead
Diffstat (limited to 'compiler/main/DriverPipeline.hs')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 840a0470e2..de717b05d4 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -148,8 +148,7 @@ compileOne' m_tc_result mHscMessage output_fn <- getOutputFilename next_phase Temporary basename dflags next_phase (Just location) - let dflags' = dflags { hscOutName = output_fn, - extCoreName = basename ++ ".hcr" } + let dflags' = dflags { extCoreName = basename ++ ".hcr" } let hsc_env' = hsc_env { hsc_dflags = dflags' } -- -fforce-recomp should also work with --make @@ -1039,11 +1038,9 @@ runPhase (HscOut src_flavour mod_name result) _ dflags = do HscRecomp cgguts mod_summary -> do output_fn <- phaseOutputFilename next_phase - let dflags' = dflags { hscOutName = output_fn } - setDynFlags dflags' PipeState{hsc_env=hsc_env'} <- getPipeState - (outputFilename, mStub) <- liftIO $ hscGenHardCode hsc_env' cgguts mod_summary + (outputFilename, mStub) <- liftIO $ hscGenHardCode hsc_env' cgguts mod_summary output_fn case mStub of Nothing -> return () Just stub_c -> @@ -1071,13 +1068,12 @@ runPhase (RealPhase Cmm) input_fn dflags output_fn <- phaseOutputFilename next_phase - let dflags' = dflags { hscOutName = output_fn, - extCoreName = src_basename ++ ".hcr" } + let dflags' = dflags { extCoreName = src_basename ++ ".hcr" } setDynFlags dflags' PipeState{hsc_env} <- getPipeState - liftIO $ hscCompileCmmFile hsc_env input_fn + liftIO $ hscCompileCmmFile hsc_env input_fn output_fn return (RealPhase next_phase, output_fn) |