summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-01-11 18:44:01 +0000
committerIan Lynagh <ian@well-typed.com>2013-01-11 19:08:19 +0000
commitacb0cd9485b3f9eb96480ff25b00b66038e1b090 (patch)
tree88bd66ef52ba68f81e62902efa9cdbb855d4b8e2 /ghc
parent68833e5e8caa1c23f75ab8bea4377ede28ff9548 (diff)
downloadhaskell-acb0cd9485b3f9eb96480ff25b00b66038e1b090.tar.gz
Don't make -C imply -fvia-C
All -fvia-C does nowadays is print a warning saying that it doesn't do anything.
Diffstat (limited to 'ghc')
-rw-r--r--ghc/Main.hs10
1 files changed, 1 insertions, 9 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 05a986daae..cca4581061 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -545,7 +545,7 @@ mode_flags =
addFlag "-no-link" f))
, Flag "M" (PassFlag (setMode doMkDependHSMode))
, Flag "E" (PassFlag (setMode (stopBeforeMode anyHsc)))
- , Flag "C" (PassFlag setGenerateC)
+ , Flag "C" (PassFlag (setMode (stopBeforeMode HCc)))
, Flag "S" (PassFlag (setMode (stopBeforeMode As)))
, Flag "-make" (PassFlag (setMode doMakeMode))
, Flag "-interactive" (PassFlag (setMode doInteractiveMode))
@@ -553,14 +553,6 @@ mode_flags =
, Flag "e" (SepArg (\s -> setMode (doEvalMode s) "-e"))
]
-setGenerateC :: String -> EwM ModeM ()
-setGenerateC f = do -- TODO: We used to warn and ignore when
- -- unregisterised, but we no longer know whether
- -- we are unregisterised at this point. Should
- -- we check later on?
- setMode (stopBeforeMode HCc) f
- addFlag "-fvia-C" f
-
setMode :: Mode -> String -> EwM ModeM ()
setMode newMode newFlag = liftEwM $ do
(mModeFlag, errs, flags') <- getCmdLineState