diff options
Diffstat (limited to 'compiler/GHC/Driver/Pipeline.hs')
| -rw-r--r-- | compiler/GHC/Driver/Pipeline.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs index e79d1ecab9..0a75b62248 100644 --- a/compiler/GHC/Driver/Pipeline.hs +++ b/compiler/GHC/Driver/Pipeline.hs @@ -814,19 +814,21 @@ runPipeline stop_phase hsc_env0 (input_fn, mb_input_buf, mb_phase) | otherwise -> do debugTraceMsg logger dflags 4 (text "Running the full pipeline again for -dynamic-too") - let dflags' = flip gopt_unset Opt_BuildDynamicToo + let dflags0 = flip gopt_unset Opt_BuildDynamicToo $ setDynamicNow $ dflags - hsc_env' <- newHscEnv dflags' - (dbs,unit_state,home_unit) <- initUnits logger dflags' Nothing - unit_env0 <- initUnitEnv (ghcNameVersion dflags') (targetPlatform dflags') + hsc_env' <- newHscEnv dflags0 + (dbs,unit_state,home_unit,mconstants) <- initUnits logger dflags0 Nothing + dflags1 <- updatePlatformConstants dflags0 mconstants + unit_env0 <- initUnitEnv (ghcNameVersion dflags1) (targetPlatform dflags1) let unit_env = unit_env0 { ue_home_unit = Just home_unit , ue_units = unit_state , ue_unit_dbs = Just dbs } let hsc_env'' = hsc_env' - { hsc_unit_env = unit_env + { hsc_dflags = dflags1 + , hsc_unit_env = unit_env } _ <- runPipeline' start_phase hsc_env'' env input_fn' maybe_loc foreign_os |