From d992bfc87b1a5f2e088df50aa8380ea29f2bc63c Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sat, 14 Jun 2008 18:17:40 +0000
Subject: [PATCH] Use -fforce-recomp rather than -no-recomp

---
 compat/Makefile                 |    2 +-
 compiler/Makefile               |    4 ++--
 compiler/main/DriverPipeline.hs |    4 ++--
 compiler/main/Main.hs           |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compat/Makefile b/compat/Makefile
index dafb8a0..3804dd4 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -96,7 +96,7 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/
 # Make the #includes in the stubs independent of the current location
 SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
 
-SRC_HC_OPTS +=  -fglasgow-exts -no-recomp
+SRC_HC_OPTS +=  -fglasgow-exts -fforce-recomp
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 Compat/Directory_HC_OPTS += -\#include shlobj.h
diff --git a/compiler/Makefile b/compiler/Makefile
index d2195c7..30ec286 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -626,7 +626,7 @@ endif
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-# There used to be a -no-recomp flag on PrimOp, but why?
+# There used to be a -fforce-recomp flag on PrimOp, but why?
 # It's an expensive module to recompile!
 prelude/PrimOp_HC_OPTS 		= -H80m
 
@@ -1042,7 +1042,7 @@ endif
 # careful to recompile stuff you need if you reconfigure or change HsVersions.h.
 
 # Aargh, these don't work properly anyway, because GHC's recompilation checker
-# just reports "compilation NOT required".  Do we have to add -no-recomp for each
+# just reports "compilation NOT required".  Do we have to add -fforce-recomp for each
 # of these .hs files?  I haven't done anything about this yet.
 
 $(odir)/codeGen/Bitmap.$(way_)o		:  ../includes/MachDeps.h
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index b9de306..a59cf46 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -130,7 +130,7 @@ compile hsc_env0 summary mod_index nmods mb_old_iface maybe_old_linkable
 				extCoreName = basename ++ ".hcr" }
    let hsc_env' = hsc_env { hsc_dflags = dflags' }
 
-   -- -no-recomp should also work with --make
+   -- -fforce-recomp should also work with --make
    let force_recomp = dopt Opt_ForceRecomp dflags
        source_unchanged = isJust maybe_old_linkable && not force_recomp
        object_filename = ml_obj_file location
@@ -295,7 +295,7 @@ link LinkBinary dflags batch_attempt_linking hpt
 
         -- if the modification time on the executable is later than the
         -- modification times on all of the objects, then omit linking
-        -- (unless the -no-recomp flag was given).
+        -- (unless the -fforce-recomp flag was given).
         e_exe_time <- IO.try $ getModificationTime exe_file
         extra_ld_inputs <- readIORef v_Ld_inputs
         extra_times <- mapM (IO.try . getModificationTime) extra_ld_inputs
diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index 8297323..abf674f 100644
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -417,7 +417,7 @@ mode_flags =
        -- -fno-code says to stop after Hsc but don't generate any code.
   , Flag "fno-code"     (PassFlag (\f -> do setMode (StopBefore HCc) f
                                             addFlag "-fno-code"
-                                            addFlag "-no-recomp"))
+                                            addFlag "-fforce-recomp"))
          Supported
   ]
 
-- 
1.7.10.4