[project @ 2005-04-13 21:42:17 by wolfgang]

[ghc-hetmet.git] / ghc / compiler / main / CodeOutput.lhs

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index 3a3e4bb..723227f 100644 (file)
--- a/ghc/compiler/main/CodeOutput.lhs
+++ b/ghc/compiler/main/CodeOutput.lhs
@@ -19,7 +19,6 @@ import IlxGen         ( ilxGen )
 
 #ifdef JAVA
 import JavaGen         ( javaGen )
-import OccurAnal       ( occurAnalyseBinds )
 import qualified PrintJava
 import OccurAnal       ( occurAnalyseBinds )
 #endif
@@ -28,11 +27,11 @@ import Distribution.Package ( showPackageId )
 import PprC            ( writeCs )
 import CmmLint         ( cmmLint )
 import Packages
-import DriverUtil      ( filenameOf )
+import Util            ( filenameOf )
 import FastString      ( unpackFS )
 import Cmm             ( Cmm )
 import HscTypes
-import CmdLineOpts
+import DynFlags
 import ErrUtils                ( dumpIfSet_dyn, showPass, ghcExit )
 import Outputable
 import Pretty          ( Mode(..), printDoc )
@@ -78,9 +77,9 @@ codeOutput dflags this_mod foreign_stubs deps flat_abstractC
                }
 
        ; showPass dflags "CodeOutput"
-       ; let filenm = dopt_OutName dflags 
+       ; let filenm = hscOutName dflags 
        ; stubs_exist <- outputForeignStubs dflags foreign_stubs
-       ; case dopt_HscLang dflags of {
+       ; case hscTarget dflags of {
              HscInterpreted -> return ();
              HscAsm         -> outputAsm dflags filenm flat_abstractC;
              HscC           -> outputC dflags filenm flat_abstractC stubs_exist
@@ -153,7 +152,7 @@ outputC dflags filenm flat_absC
          hPutStr h cc_injects
          when stub_h_exists $ 
             hPutStrLn h ("#include \"" ++ (filenameOf (hscStubHOutName dflags)) ++ "\"")
-         writeCs h flat_absC
+         writeCs dflags h flat_absC
 \end{code}
 
 
@@ -245,7 +244,7 @@ outputForeignStubs dflags (ForeignStubs h_code c_code _ _)
        -- we need the #includes from the rts package for the stub files
        let rtsid = rtsPackageId (pkgState dflags)
            rts_includes 
-               | Just pid <- rtsid = 
+               | ExtPackage pid <- rtsid = 
                        let rts_pkg = getPackageDetails (pkgState dflags) pid in
                        concatMap mk_include (includes rts_pkg)
                | otherwise = []