X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=f08b613555b2c2a68390f98fe9cfa85960a8953c;hb=cb906a124e36cb5054784a5bc44eb9d099d20709;hp=3b8f51ee17009dcb1cdefcff1b9fab6caa53a423;hpb=25628e2771424cae1b3366322e8ce6f8a85440f9;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 3b8f51e..f08b613 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -239,7 +239,7 @@ import CoreSyn
 import TidyPgm
 import DriverPipeline
 import DriverPhases	( HscSource(..), Phase(..), isHaskellSrcFilename, startPhase )
-import HeaderInfo	( getImports, getOptions )
+import HeaderInfo
 import Finder
 import HscMain
 import HscTypes
@@ -255,10 +255,7 @@ import FiniteMap
 import Panic
 import Digraph
 import Bag		( unitBag, listToBag )
-import ErrUtils		( Severity(..), showPass, fatalErrorMsg, debugTraceMsg,
-			  mkPlainErrMsg, printBagOfErrors, printBagOfWarnings,
-			  WarnMsg )
-import qualified ErrUtils
+import ErrUtils
 import Util
 import StringBuffer	( StringBuffer, hGetStringBuffer )
 import Outputable
@@ -351,8 +348,8 @@ newSession mb_top_dir = do
   installSignalHandlers
 
   initStaticOpts
-  dflags0 <- initSysTools mb_top_dir defaultDynFlags
-  dflags  <- initDynFlags dflags0
+  dflags0 <- initDynFlags defaultDynFlags
+  dflags <- initSysTools mb_top_dir dflags0
   env <- newHscEnv dflags
   ref <- newIORef env
   return (Session ref)
@@ -1936,10 +1933,11 @@ preprocessFile hsc_env src_fn mb_phase (Just (buf, _time))
         let dflags = hsc_dflags hsc_env
 	-- case we bypass the preprocessing stage?
 	let 
-	    local_opts = getOptions buf src_fn
+	    local_opts = getOptions dflags buf src_fn
 	--
-	(dflags', _errs) <- parseDynamicFlags dflags (map unLoc local_opts)
-        -- XXX: shouldn't we be reporting the errors?
+	(dflags', leftovers, warns) <- parseDynamicFlags dflags (map unLoc local_opts)
+        checkProcessArgsResult leftovers src_fn
+        handleFlagWarnings dflags' warns
 
 	let
 	    needs_preprocessing