From b17eae42ad936fd88ddcc356ba876e8a0910d46b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 23 Sep 2007 18:16:20 +0000 Subject: [PATCH] Notice when C modules have changed when deciding whether or not to link Based on a patch from Lemmih --- compiler/main/DriverPipeline.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index c0595f9..22ce8c4 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -304,10 +304,13 @@ link LinkBinary dflags batch_attempt_linking hpt -- modification times on all of the objects, then omit linking -- (unless the -no-recomp flag was given). e_exe_time <- IO.try $ getModificationTime exe_file - let linking_needed + extra_ld_inputs <- readIORef v_Ld_inputs + extra_times <- mapM (IO.try . getModificationTime) extra_ld_inputs + let other_times = map linkableTime linkables + ++ [ t' | Right t' <- extra_times ] + linking_needed | Left _ <- e_exe_time = True - | Right t <- e_exe_time = - any (t <) (map linkableTime linkables) + | Right t <- e_exe_time = any (t <) other_times if not (dopt Opt_ForceRecomp dflags) && not linking_needed then do debugTraceMsg dflags 2 (text exe_file <+> ptext SLIT("is up to date, linking not required.")) -- 1.7.10.4