[project @ 2005-04-13 13:17:35 by simonmar]

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

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index 695162c..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,12 +27,11 @@ import Distribution.Package ( showPackageId )
 import PprC            ( writeCs )
 import CmmLint         ( cmmLint )
 import Packages
-import DriverState     ( getExplicitPackagesAnd, getPackageCIncludes )
-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 )
@@ -79,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
@@ -125,7 +123,7 @@ outputC dflags filenm flat_absC
        --   * the _stub.h file, if there is one.
        --
        let packages = dep_pkgs dependencies
-       pkg_configs <- getExplicitPackagesAnd packages
+       pkg_configs <- getExplicitPackagesAnd dflags packages
        let pkg_names = map (showPackageId.package) pkg_configs
 
        c_includes <- getPackageCIncludes pkg_configs
@@ -154,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}
 
 
@@ -244,8 +242,12 @@ outputForeignStubs dflags (ForeignStubs h_code c_code _ _)
                       "Foreign export header file" stub_h_output_d
 
        -- we need the #includes from the rts package for the stub files
-       rts_pkgs <- getPackageDetails [rtsPackage]
-       let rts_includes = concatMap mk_include (concatMap includes rts_pkgs)
+       let rtsid = rtsPackageId (pkgState dflags)
+           rts_includes 
+               | ExtPackage pid <- rtsid = 
+                       let rts_pkg = getPackageDetails (pkgState dflags) pid in
+                       concatMap mk_include (includes rts_pkg)
+               | otherwise = []
            mk_include i = "#include \"" ++ i ++ "\"\n"
 
        stub_h_file_exists