[commit: ghc] master: checkStability: respect -fforce-recomp (#6105) (c95342c)

Simon Marlow marlowsd at gmail.com
Tue May 22 14:20:08 CEST 2012


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c95342cef63fad2edfaf3868de11ff7781b440c8

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

commit c95342cef63fad2edfaf3868de11ff7781b440c8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue May 22 12:30:36 2012 +0100

    checkStability: respect -fforce-recomp (#6105)

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

 compiler/main/GhcMake.hs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 910e1f6..9fb4287 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -560,6 +560,7 @@ checkStability hpt sccs all_home_mods = foldl checkSCC ([],[]) sccs
            && all bco_ok scc
 
         object_ok ms
+          | dopt Opt_ForceRecomp (ms_hspp_opts ms) = False
           | Just t <- ms_obj_date ms  =  t >= ms_hs_date ms 
                                          && same_as_prev t
           | otherwise = False
@@ -579,7 +580,8 @@ checkStability hpt sccs all_home_mods = foldl checkSCC ([],[]) sccs
                 -- a problem.
 
         bco_ok ms
-          = case lookupUFM hpt (ms_mod_name ms) of
+          | dopt Opt_ForceRecomp (ms_hspp_opts ms) = False
+          | otherwise = case lookupUFM hpt (ms_mod_name ms) of
                 Just hmi  | Just l <- hm_linkable hmi ->
                         not (isObjectLinkable l) && 
                         linkableTime l >= ms_hs_date ms





More information about the Cvs-ghc mailing list