Merge DynFlags changes

[ghc-hetmet.git] / compiler / main / DynFlags.hs

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index a176a73..3a4c563 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -84,9 +84,10 @@ import Util          ( split )
 import Data.Char       ( isDigit, isUpper )
 import System.IO        ( hPutStrLn, stderr )
 
+#ifdef GHCI
 import Breakpoints      ( BkptHandler )
 import Module           ( ModuleName )
-
+#endif
 -- -----------------------------------------------------------------------------
 -- DynFlags
 
@@ -200,7 +201,9 @@ data DynFlag
    | Opt_SplitObjs
    | Opt_StgStats
    | Opt_HideAllPackages
+#if defined(GHCI) && defined(DEBUGGER)
    | Opt_Debugging
+#endif
    | Opt_PrintBindResult
    | Opt_Haddock
 
@@ -308,8 +311,10 @@ data DynFlags = DynFlags {
   -- message output
   log_action            :: Severity -> SrcSpan -> PprStyle -> Message -> IO ()
 
+#ifdef GHCI
   -- breakpoint handling
  ,bkptHandler           :: Maybe (BkptHandler Module)
+#endif
  }
 
 data HscTarget
@@ -418,8 +423,9 @@ defaultDynFlags =
        packageFlags            = [],
         pkgDatabase             = Nothing,
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
-
+#ifdef GHCI
         bkptHandler             = Nothing,
+#endif
        flags = [ 
            Opt_ReadUserPackageConf,
     
@@ -1055,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 )
   ]