Commit d992bfc8 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Use -fforce-recomp rather than -no-recomp

parent b065ad65
...@@ -96,7 +96,7 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/ ...@@ -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 # Make the #includes in the stubs independent of the current location
SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries 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" ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
Compat/Directory_HC_OPTS += -\#include shlobj.h Compat/Directory_HC_OPTS += -\#include shlobj.h
......
...@@ -626,7 +626,7 @@ endif ...@@ -626,7 +626,7 @@ endif
# The standard suffix rule for compiling a Haskell file # The standard suffix rule for compiling a Haskell file
# adds these flags to the command line # 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! # It's an expensive module to recompile!
prelude/PrimOp_HC_OPTS = -H80m prelude/PrimOp_HC_OPTS = -H80m
...@@ -1042,7 +1042,7 @@ endif ...@@ -1042,7 +1042,7 @@ endif
# careful to recompile stuff you need if you reconfigure or change HsVersions.h. # 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 # 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. # of these .hs files? I haven't done anything about this yet.
$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h $(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h
......
...@@ -130,7 +130,7 @@ compile hsc_env0 summary mod_index nmods mb_old_iface maybe_old_linkable ...@@ -130,7 +130,7 @@ compile hsc_env0 summary mod_index nmods mb_old_iface maybe_old_linkable
extCoreName = basename ++ ".hcr" } extCoreName = basename ++ ".hcr" }
let hsc_env' = hsc_env { hsc_dflags = dflags' } 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 let force_recomp = dopt Opt_ForceRecomp dflags
source_unchanged = isJust maybe_old_linkable && not force_recomp source_unchanged = isJust maybe_old_linkable && not force_recomp
object_filename = ml_obj_file location object_filename = ml_obj_file location
...@@ -295,7 +295,7 @@ link LinkBinary dflags batch_attempt_linking hpt ...@@ -295,7 +295,7 @@ link LinkBinary dflags batch_attempt_linking hpt
-- if the modification time on the executable is later than the -- if the modification time on the executable is later than the
-- modification times on all of the objects, then omit linking -- 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 e_exe_time <- IO.try $ getModificationTime exe_file
extra_ld_inputs <- readIORef v_Ld_inputs extra_ld_inputs <- readIORef v_Ld_inputs
extra_times <- mapM (IO.try . getModificationTime) extra_ld_inputs extra_times <- mapM (IO.try . getModificationTime) extra_ld_inputs
......
...@@ -417,7 +417,7 @@ mode_flags = ...@@ -417,7 +417,7 @@ mode_flags =
-- -fno-code says to stop after Hsc but don't generate any code. -- -fno-code says to stop after Hsc but don't generate any code.
, Flag "fno-code" (PassFlag (\f -> do setMode (StopBefore HCc) f , Flag "fno-code" (PassFlag (\f -> do setMode (StopBefore HCc) f
addFlag "-fno-code" addFlag "-fno-code"
addFlag "-no-recomp")) addFlag "-fforce-recomp"))
Supported Supported
] ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment