summaryrefslogtreecommitdiff
path: root/compiler/main/GhcMake.hs
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-10-16 15:28:26 +0100
committerIan Lynagh <ian@well-typed.com>2012-10-16 16:08:38 +0100
commitcd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5 (patch)
tree30fb18578f1c5c81fef7ccc6ec5879a41fd4e5c0 /compiler/main/GhcMake.hs
parent6759e5a482d927870c90efe97b820d492785a6fd (diff)
downloadhaskell-cd33eefd0467ae7ee4d22f16fcaaccfd33f18cb5.tar.gz
Some alpha renaming
Mostly d -> g (matching DynFlag -> GeneralFlag). Also renamed if* to when*, matching the Haskell if/when names
Diffstat (limited to 'compiler/main/GhcMake.hs')
-rw-r--r--compiler/main/GhcMake.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 6dd27029f1..62ac63fc1d 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -283,7 +283,7 @@ load how_much = do
-- that main() is going to come from somewhere else.
--
let ofile = outputFile dflags
- let no_hs_main = dopt Opt_NoHsMain dflags
+ let no_hs_main = gopt Opt_NoHsMain dflags
let
main_mod = mainModIs dflags
a_root_is_Main = any ((==main_mod).ms_mod) mod_graph
@@ -562,7 +562,7 @@ checkStability hpt sccs all_home_mods = foldl checkSCC ([],[]) sccs
&& all bco_ok scc
object_ok ms
- | dopt Opt_ForceRecomp (ms_hspp_opts ms) = False
+ | gopt Opt_ForceRecomp (ms_hspp_opts ms) = False
| Just t <- ms_obj_date ms = t >= ms_hs_date ms
&& same_as_prev t
| otherwise = False
@@ -582,7 +582,7 @@ checkStability hpt sccs all_home_mods = foldl checkSCC ([],[]) sccs
-- a problem.
bco_ok ms
- | dopt Opt_ForceRecomp (ms_hspp_opts ms) = False
+ | gopt 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) &&
@@ -1414,7 +1414,7 @@ preprocessFile hsc_env src_fn mb_phase (Just (buf, _time))
| Nothing <- mb_phase, Unlit _ <- startPhase src_fn = True
-- note: local_opts is only required if there's no Unlit phase
| xopt Opt_Cpp dflags' = True
- | dopt Opt_Pp dflags' = True
+ | gopt Opt_Pp dflags' = True
| otherwise = False
when needs_preprocessing $