From: Ian Lynagh <igloo@earth.li>
Date: Sat, 19 Jan 2008 21:26:02 +0000 (+0000)
Subject: Fix giving an error if we are given conflicting mode flags
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=b774e696e8b1f5c4d20acd0fc45cbc9c1db76edb

Fix giving an error if we are given conflicting mode flags
---

diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index 7c77caf..dc03f64 100644
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -397,10 +397,10 @@ mode_flags =
 setMode :: CmdLineMode -> String -> ModeM ()
 setMode m flag = do
   (old_mode, old_flag, flags) <- getCmdLineState
-  when (notNull old_flag && flag /= old_flag) $
-      throwDyn (UsageError 
-          ("cannot use `" ++ old_flag ++ "' with `" ++ flag ++ "'"))
-  putCmdLineState (m, flag, flags)
+  if notNull old_flag && flag /= old_flag
+      then throwDyn (UsageError
+               ("cannot use `" ++ old_flag ++ "' with `" ++ flag ++ "'"))
+      else putCmdLineState (m, flag, flags)
 
 addFlag :: String -> ModeM ()
 addFlag s = do