X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fmain%2FGHC.hs;h=b00f79f150b63e9efd13fbe4ac66328ba12b0cd5;hb=703ca1542c8e0983cc9d8eebce6e9f3dd3fd71e2;hp=c5571cbd9ff549f38848a3943a0cff0caacd52a5;hpb=ef03a76a01e538ccae5239dce00c583e9da17984;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index c5571cb..b00f79f 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -245,7 +245,6 @@ import qualified Linker
 import Linker           ( HValue )
 import ByteCodeInstr
 import BreakArray
-import NameSet
 import InteractiveEval
 import TcRnDriver
 #endif
@@ -265,10 +264,10 @@ import Var
 import TysPrim		( alphaTyVars )
 import TyCon
 import Class
-import FunDeps
+-- import FunDeps
 import DataCon
 import Name             hiding ( varName )
-import OccName		( parenSymOcc )
+-- import OccName		( parenSymOcc )
 import InstEnv		( Instance, instanceDFunId, pprInstance, pprInstanceHdr,
                           emptyInstEnv )
 import FamInstEnv       ( emptyFamInstEnv )
@@ -276,7 +275,7 @@ import SrcLoc
 --import CoreSyn
 import TidyPgm
 import DriverPipeline
-import DriverPhases	( HscSource(..), Phase(..), isHaskellSrcFilename, startPhase )
+import DriverPhases	( Phase(..), isHaskellSrcFilename, startPhase )
 import HeaderInfo
 import Finder
 import HscMain
@@ -784,7 +783,7 @@ load2 how_much mod_graph = do
 				(flattenSCCs mg2_with_srcimps)
 				stable_mods
 
-	liftIO $ evaluate pruned_hpt
+	_ <- liftIO $ evaluate pruned_hpt
 
         -- before we unload anything, make sure we don't leave an old
         -- interactive context around pointing to dead bindings.  Also,
@@ -888,7 +887,7 @@ load2 how_much mod_graph = do
 	      let 
 	 	main_mod = mainModIs dflags
 		a_root_is_Main = any ((==main_mod).ms_mod) mod_graph
-		do_linking = a_root_is_Main || no_hs_main
+		do_linking = a_root_is_Main || no_hs_main || ghcLink dflags == LinkDynLib
 
 	      when (ghcLink dflags == LinkBinary 
                     && isJust ofile && not do_linking) $
@@ -1208,7 +1207,7 @@ compileCoreToObj simplify cm@(CoreModule{ cm_module = mName }) = do
   (iface, changed, _details, cgguts)
       <- hscNormalIface guts Nothing
   hscWriteIface iface changed modSummary
-  hscGenHardCode cgguts modSummary
+  _ <- hscGenHardCode cgguts modSummary
   return ()
 
 -- Makes a "vanilla" ModGuts.
@@ -1242,7 +1241,7 @@ compileCore simplify fn = do
    -- First, set the target to the desired filename
    target <- guessTarget fn Nothing
    addTarget target
-   load LoadAllTargets
+   _ <- load LoadAllTargets
    -- Then find dependencies
    modGraph <- depanal [] True
    case find ((== fn) . msHsFilePath) modGraph of