[project @ 2005-03-07 16:46:08 by simonpj]

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

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index 3a3e4bb..b01b668 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
@@ -80,7 +79,7 @@ codeOutput dflags this_mod foreign_stubs deps flat_abstractC
        ; showPass dflags "CodeOutput"
        ; let filenm = dopt_OutName dflags 
        ; stubs_exist <- outputForeignStubs dflags foreign_stubs
-       ; case dopt_HscLang dflags of {
+       ; case dopt_HscTarget dflags of {
              HscInterpreted -> return ();
              HscAsm         -> outputAsm dflags filenm flat_abstractC;
              HscC           -> outputC dflags filenm flat_abstractC stubs_exist
@@ -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 = []