Merge DynFlags changes

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index d1226ea..3a4c563 100644 (file)
--- 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 )
   ]