X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FCodeOutput.lhs;h=2d68b830ecfc6f5ffed74dee6cf31f987d4147b6;hb=6a944ae7fe1e8e2e456c68717188463263f8978f;hp=d2d7c7f16d314ac353391ff0cd2f51ea4ec695c3;hpb=e25d5095e6fd47e0a02404d9532c2f776d3f8a32;p=ghc-hetmet.git

diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index d2d7c7f..2d68b83 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -33,11 +33,11 @@ import Outputable
 import Module
 import Maybes		( firstJust )
 
-import Distribution.Text
-import Directory	( doesFileExist )
-import Monad		( when )
-import IO
+import Control.Exception
+import Control.Monad
+import System.Directory
 import System.FilePath
+import System.IO
 \end{code}
 
 %************************************************************************
@@ -127,7 +127,7 @@ outputC dflags filenm flat_absC packages
        	       _          -> "#include \""++h_file++"\""
 
        pkg_configs <- getPreloadPackagesAnd dflags packages
-       let pkg_names = map (display.package) pkg_configs
+       let pkg_names = map (display.sourcePackageId) pkg_configs
 
        doOutput filenm $ \ h -> do
 	  hPutStr h ("/* GHC_PACKAGES " ++ unwords pkg_names ++ "\n*/\n")
@@ -144,10 +144,10 @@ outputC dflags filenm flat_absC packages
 
 \begin{code}
 outputAsm :: DynFlags -> FilePath -> [RawCmm] -> IO ()
-outputAsm dflags filenm flat_absC
 
 #ifndef OMIT_NATIVE_CODEGEN
 
+outputAsm dflags filenm flat_absC
   = do ncg_uniqs <- mkSplitUniqSupply 'n'
 
        {-# SCC "OutputAsm" #-} doOutput filenm $
@@ -157,6 +157,7 @@ outputAsm dflags filenm flat_absC
 
 #else /* OMIT_NATIVE_CODEGEN */
 
+outputAsm _ _ _
   = pprPanic "This compiler was built without a native code generator"
 	     (text "Use -fvia-C instead")