[commit: ghc] master: Always re-summarise modules when -fforce-recomp is set (0858061)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/08580616db410325dec7c5ebf36fef64b46a8f10/ghc

>---------------------------------------------------------------

commit 08580616db410325dec7c5ebf36fef64b46a8f10
Author: Patrick Palka <patrick at parcs.ath.cx>
Date:   Wed Nov 13 19:08:24 2013 -0500

    Always re-summarise modules when -fforce-recomp is set
    
    Fixes #8526


>---------------------------------------------------------------

08580616db410325dec7c5ebf36fef64b46a8f10
 compiler/main/GhcMake.hs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 4f9dbaf..c8afd83 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -1658,7 +1658,8 @@ summariseFile hsc_env old_summaries file mb_phase obj_allowed maybe_buf
                 -- behaviour.
 
                 -- return the cached summary if the source didn't change
-        if ms_hs_date old_summary == src_timestamp
+        if ms_hs_date old_summary == src_timestamp &&
+           not (gopt Opt_ForceRecomp (hsc_dflags hsc_env))
            then do -- update the object-file timestamp
                   obj_timestamp <-
                     if isObjectTarget (hscTarget (hsc_dflags hsc_env))
@@ -1758,7 +1759,8 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod)
     hsc_src = if is_boot then HsBootFile else HsSrcFile
 
     check_timestamp old_summary location src_fn src_timestamp
-        | ms_hs_date old_summary == src_timestamp = do
+        | ms_hs_date old_summary == src_timestamp &&
+          not (gopt Opt_ForceRecomp dflags) = do
                 -- update the object-file timestamp
                 obj_timestamp <-
                     if isObjectTarget (hscTarget (hsc_dflags hsc_env))