X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FCodeOutput.lhs;h=b01b6680a2e171327aaa1f8177c10f726d5c017e;hb=36d22a1cb608e8572776ab6d402fd0c1a9287dc5;hp=3a3e4bbf1789cd3601fd384878ac619d3f1f49d4;hpb=ef5b4b146aa172d8ac10f39b5eb3d7a0f948d8f1;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index 3a3e4bb..b01b668 100644
--- 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 = []