X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=0a361a478fb5fdaf6abf8181aeb31190222355d8;hb=82c4d36b187955e3cedbb11cff92688747773456;hp=f02e6767745ae3af79e7ba866814eeff97d83236;hpb=6e0c3f50e131f502577a61b09a339af295de9d23;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index f02e676..0a361a4 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS -fno-warn-missing-fields #-}
 -----------------------------------------------------------------------------
 --
 -- Dynamic flags
@@ -63,6 +64,7 @@ import Config
 import CmdLineParser
 import Constants	( mAX_CONTEXT_REDUCTION_DEPTH )
 import Panic		( panic, GhcException(..) )
+import UniqFM           ( UniqFM )
 import Util		( notNull, splitLongestPrefix, normalisePath )
 import Maybes		( fromJust, orElse )
 import SrcLoc           ( SrcSpan )
@@ -246,6 +248,9 @@ data DynFlags = DynFlags {
   cmdlineFrameworks	:: [String],	-- ditto
   tmpDir		:: String,	-- no trailing '/'
   
+  ghcUsagePath          :: FilePath,    -- Filled in by SysTools
+  ghciUsagePath         :: FilePath,    -- ditto
+
   -- options for particular phases
   opt_L			:: [String],
   opt_P			:: [String],
@@ -267,16 +272,23 @@ data DynFlags = DynFlags {
   pgm_a			:: (String,[Option]),
   pgm_l			:: (String,[Option]),
   pgm_dll		:: (String,[Option]),
+  pgm_T                 :: String,
+  pgm_sysman            :: String,
 
-  --  ** Package flags
+  --  Package flags
   extraPkgConfs		:: [FilePath],
+  topDir                :: FilePath,    -- filled in by SysTools
+  systemPackageConfig   :: FilePath,    -- ditto
 	-- The -package-conf flags given on the command line, in the order
 	-- they appeared.
 
   packageFlags		:: [PackageFlag],
 	-- The -package and -hide-package flags from the command-line
 
-  --  ** Package state
+  -- Package state
+  -- NB. do not modify this field, it is calculated by 
+  -- Packages.initPackages and Packages.updatePackages.
+  pkgDatabase           :: Maybe (UniqFM InstalledPackageInfo),
   pkgState		:: PackageState,
 
   -- hsc dynamic flags
@@ -322,6 +334,7 @@ data PackageFlag
   = ExposePackage  String
   | HidePackage    String
   | IgnorePackage  String
+  deriving Eq
 
 defaultHscTarget
   | cGhcWithNativeCodeGen == "YES" 	=  HscAsm
@@ -359,10 +372,6 @@ defaultDynFlags =
 	ctxtStkDepth		= mAX_CONTEXT_REDUCTION_DEPTH,
 
 	thisPackage		= mainPackageId,
-	
-	wayNames		= panic "ways",
-	buildTag		= panic "buildTag",
-	rtsBuildTag		= panic "rtsBuildTag",
 
 	objectDir		= Nothing,
 	hiDir			= Nothing,
@@ -390,19 +399,10 @@ defaultDynFlags =
 	opt_dll			= [],
 	opt_dep			= [],
 	
-	pgm_L			= panic "pgm_L",
-	pgm_P			= panic "pgm_P",
-	pgm_F			= panic "pgm_F",
-	pgm_c			= panic "pgm_c",
-	pgm_m			= panic "pgm_m",
-	pgm_s			= panic "pgm_s",
-	pgm_a			= panic "pgm_a",
-	pgm_l			= panic "pgm_l",
-	pgm_dll			= panic "pgm_mkdll",
-	
 	extraPkgConfs		= [],
 	packageFlags		= [],
-	pkgState		= panic "pkgState",
+        pkgDatabase             = Nothing,
+        pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
 	
 	flags = [ 
     	    Opt_RecompChecking,
@@ -1042,8 +1042,7 @@ glasgowExtsFlags = [
   Opt_GlasgowExts, 
   Opt_FFI, 
   Opt_ImplicitParams, 
-  Opt_ScopedTypeVariables,
-  Opt_BangPatterns ]
+  Opt_ScopedTypeVariables ]
 
 isFFlag f = f `elem` (map fst fFlags)
 getFFlag f = fromJust (lookup f fFlags)