From: Ian Lynagh <igloo@earth.li>
Date: Sat, 16 Dec 2006 17:39:57 +0000 (+0000)
Subject: Merge DynFlags changes
X-Git-Tag: 2006-12-17^0
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5d34920bdc3ed6fa74db8af924c1f90a505a1e89

Merge DynFlags changes
---

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index d1226ea..3a4c563 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1061,9 +1061,10 @@ fFlags = [
   ( "excess-precision",			Opt_ExcessPrecision ),
   ( "asm-mangling",			Opt_DoAsmMangling ),
   ( "print-bind-result",		Opt_PrintBindResult ),
-  ( "force-recomp",			Opt_ForceRecomp ),
-  ( "hpc",				Opt_Hpc ),
-  ( "hpc-tracer",			Opt_Hpc_Tracer )
+#if defined(GHCI) && defined(DEBUGGER)
+  ( "debugging",                        Opt_Debugging),
+#endif
+  ( "force-recomp",			Opt_ForceRecomp )
   ]