[project @ 2002-03-13 13:51:34 by simonmar]

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

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index bfeed98..0c60aff 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.99 2002/03/12 16:45:59 simonmar Exp $
+-- $Id: Main.hs,v 1.100 2002/03/13 13:51:35 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -30,7 +30,7 @@ import SysTools               ( getPackageConfigPath, initSysTools, cleanTempFiles )
 import Packages                ( showPackages )
 
 import DriverPipeline  ( doLink, doMkDLL, genPipeline, pipeLoop )
-import DriverState     ( buildCoreToDo, buildStgToDo, defaultHscLang,
+import DriverState     ( buildCoreToDo, buildStgToDo,
                          findBuildTag, getPackageInfo, unregFlags, 
                          v_GhcMode, v_GhcModeFlag, GhcMode(..),
                          v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs,
@@ -48,7 +48,8 @@ import DriverUtil     ( add, handle, handleDyn, later, splitFilename,
                          unknownFlagErr, getFileSuffix )
 import CmdLineOpts     ( dynFlag, restoreDynFlags,
                          saveDynFlags, setDynFlags, getDynFlags, dynFlag,
-                         DynFlags(..), HscLang(..), v_Static_hsc_opts
+                         DynFlags(..), HscLang(..), v_Static_hsc_opts,
+                         defaultHscLang
                        )
 import Outputable
 import Util
@@ -194,7 +195,7 @@ main =
    dyn_flags <- getDynFlags
    let lang = case mode of 
                 DoInteractive  -> HscInterpreted
-                _other         -> defaultHscLang
+                _other         -> hscLang dyn_flags
 
    setDynFlags (dyn_flags{ coreToDo = core_todo,
                           stgToDo  = stg_todo,