From: simonmar <unknown>
Date: Tue, 16 Oct 2001 13:29:35 +0000 (+0000)
Subject: [project @ 2001-10-16 13:29:35 by simonmar]
X-Git-Tag: Approximately_9120_patches~826
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d705103654d94fc607789e593e6690fbdd555161;p=ghc-hetmet.git

[project @ 2001-10-16 13:29:35 by simonmar]
Don't print the 'Loading package...' message for packages which don't
require any loading (gmp & rts in particular).
---

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index a7c5b6d..177b2d2 100644
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.93 2001/10/16 13:25:00 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.94 2001/10/16 13:29:35 simonmar Exp $
 --
 -- GHC Interactive User Interface
 --
@@ -826,7 +826,7 @@ loaded_in_ghci
 
 linkPackage :: PackageConfig -> IO ()
 linkPackage pkg
-   = do putStr ("Loading package " ++ name pkg ++ " ... ")
+   = do 
         -- For each obj, try obj.o and if that fails, obj.so.
         -- Complication: all the .so's must be loaded before any of the .o's.  
         let dirs      =  library_dirs pkg
@@ -839,6 +839,10 @@ linkPackage pkg
         let sos_first | name pkg `elem` loaded_in_ghci = obj_libs
 		      | otherwise      		       = so_libs ++ obj_libs
 
+	-- nothing to do?
+	if null sos_first then return () else do
+
+	putStr ("Loading package " ++ name pkg ++ " ... ")
         mapM loadClassified sos_first
         putStr "linking ... "
         ok <- resolveObjs