X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FMain.hs;h=d5e8de75c3cbc450afa16bf83f6cd1039d79c3e9;hb=9bbcd77cf9b66940058dbea1827db594e8ff6d7f;hp=758451f6f31e2c1a82eb1aaa3c65df5026ef8ffa;hpb=b0cf51f6c34ad464e51ba20e07d22df379298468;p=ghc-hetmet.git

diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs
index 758451f..d5e8de7 100644
--- a/compiler/main/Main.hs
+++ b/compiler/main/Main.hs
@@ -13,7 +13,8 @@ module Main (main) where
 
 -- The official GHC API
 import qualified GHC
-import GHC		( Session, DynFlags(..), GhcMode(..), HscTarget(..),
+import GHC		( Session, DynFlags(..), HscTarget(..), 
+                          GhcMode(..), GhcLink(..),
 			  LoadHowMuch(..), dopt, DynFlag(..) )
 import CmdLineParser
 
@@ -90,29 +91,27 @@ main =
                           exitWith ExitSuccess
     _               -> return ()
 
-  let mode = case cli_mode of
-		DoInteractive	-> Interactive
-		DoEval _	-> Interactive
-		DoMake		-> BatchCompile
-		DoMkDependHS	-> MkDepend
-		_		-> OneShot
-
   -- start our GHC session
-  session <- GHC.newSession mode mbMinusB
+  session <- GHC.newSession mbMinusB
 
   dflags0 <- GHC.getSessionDynFlags session
 
-  -- set the default HscTarget.  The HscTarget can be further
-  -- adjusted on a module by module basis, using only the -fvia-C and
-  -- -fasm flags.  If the default HscTarget is not HscC or HscAsm,
-  -- -fvia-C and -fasm have no effect.
-  let lang = case cli_mode of 
-		 DoInteractive  -> HscInterpreted
-		 DoEval _	-> HscInterpreted
-		 _other		-> hscTarget dflags0
-
-  let dflags1 = dflags0{ ghcMode = mode,
-                  	 hscTarget  = lang,
+  -- set the default GhcMode, HscTarget and GhcLink.  The HscTarget
+  -- can be further adjusted on a module by module basis, using only
+  -- the -fvia-C and -fasm flags.  If the default HscTarget is not
+  -- HscC or HscAsm, -fvia-C and -fasm have no effect.
+  let dflt_target = hscTarget dflags0
+      (mode, lang, link)
+         = case cli_mode of
+		DoInteractive	-> (CompManager, HscInterpreted, LinkInMemory)
+		DoEval _	-> (CompManager, HscInterpreted, LinkInMemory)
+		DoMake		-> (CompManager, dflt_target,    LinkBinary)
+		DoMkDependHS	-> (MkDepend,    dflt_target,    LinkBinary)
+		_		-> (OneShot,     dflt_target,    LinkBinary)
+
+  let dflags1 = dflags0{ ghcMode   = mode,
+                  	 hscTarget = lang,
+                         ghcLink   = link,
 			 -- leave out hscOutName for now
 	                 hscOutName = panic "Main.main:hscOutName not set",
 		  	 verbosity = case cli_mode of
@@ -224,11 +223,15 @@ checkOptions cli_mode dflags srcs objs = do
    let unknown_opts = [ f | (f@('-':_), _) <- srcs ]
    when (notNull unknown_opts) (unknownFlagsErr unknown_opts)
 
+   when (notNull (filter isRTSWay (wayNames dflags))
+         && isInterpretiveMode cli_mode) $
+        putStrLn ("Warning: -debug, -threaded and -ticky are ignored by GHCi")
+
 	-- -prof and --interactive are not a good combination
-   when (notNull (filter (/= WayThreaded) (wayNames dflags))
+   when (notNull (filter (not . isRTSWay) (wayNames dflags))
          && isInterpretiveMode cli_mode) $
       do throwDyn (UsageError 
-                   "--interactive can't be used with -prof, -ticky, or -unreg.")
+                   "--interactive can't be used with -prof or -unreg.")
 	-- -ohi sanity check
    if (isJust (outputHi dflags) && 
       (isCompManagerMode cli_mode || srcs `lengthExceeds` 1))