From: simonmar <unknown>
Date: Tue, 21 Aug 2001 14:34:58 +0000 (+0000)
Subject: [project @ 2001-08-21 14:34:58 by simonmar]
X-Git-Tag: Approximately_9120_patches~1150
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=dd8ab37f7a5cc4c006e47684575efb0ee5f597ff;p=ghc-hetmet.git

[project @ 2001-08-21 14:34:58 by simonmar]
make -no-recomp work with --make
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index f4722bb..68c57e4 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1052,10 +1052,14 @@ compile ghci_mode summary source_unchanged have_object
 
    writeIORef v_HCHeader cc_injects
 
+   -- -no-recomp should also work with --make
+   do_recomp <- readIORef v_Recomp
+   let source_unchanged' = source_unchanged && not do_recomp
+
    -- run the compiler
    hsc_result <- hscMain ghci_mode dyn_flags'
 			 (ms_mod summary) location
-			 source_unchanged have_object old_iface hst hit pcs
+			 source_unchanged' have_object old_iface hst hit pcs
 
    case hsc_result of
       HscFail pcs -> return (CompErrs pcs)