From cd00c7714ad794b1efbc815d1521c263bca76079 Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Tue, 22 May 2012 12:30:36 +0100
Subject: [PATCH] checkStability: respect -fforce-recomp (#6105)
MERGED from commit c95342cef63fad2edfaf3868de11ff7781b440c8
---
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 cca1f17c7500..11a3ba58c295 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -576,7 +576,8 @@ checkStability hpt sccs all_home_mods = foldl checkSCC ([],[]) sccs
&& all bco_ok scc
object_ok ms
- | Just t <- ms_obj_date ms = t >= ms_hs_date 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
where
@@ -595,7 +596,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
--
GitLab