[project @ 2003-05-21 02:48:56 by igloo]

[ghc-hetmet.git] / ghc / compiler / main / DriverMkDepend.hs

diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs
index 5a2f629..5a0cd62 100644 (file)
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/ghc/compiler/main/DriverMkDepend.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverMkDepend.hs,v 1.17 2002/02/05 14:42:08 simonpj Exp $
+-- $Id: DriverMkDepend.hs,v 1.27 2003/01/08 15:28:05 simonmar Exp $
 --
 -- GHC Driver
 --
@@ -11,25 +11,28 @@ module DriverMkDepend where
 
 #include "HsVersions.h"
 
-import DriverState
-import DriverUtil
+import DriverState      
+import DriverUtil       ( add, softGetDirectoryContents, replaceFilenameSuffix )
 import DriverFlags
 import SysTools                ( newTempName )
 import qualified SysTools
-import Module
-import Module          ( isHomeModule )
-import Finder          ( findModuleDep )
-import HscTypes                ( ModuleLocation(..) )
-import Util
+import Module          ( ModuleName, ModLocation(..),
+                         moduleNameUserString, isHomeModule )
+import Finder          ( findModule, hiBootExt, hiBootVerExt )
+import Util             ( global )
 import Panic
 
-import IOExts
-import Exception
+import DATA_IOREF      ( IORef, readIORef, writeIORef )
+import EXCEPTION
 
 import Directory
 import IO
-import Monad
-import Maybe
+import Monad            ( when )
+import Maybe            ( isJust )
+
+#if __GLASGOW_HASKELL__ <= 408
+import Panic           ( catchJust, ioErrors )
+#endif
 
 -------------------------------------------------------------------------------
 -- mkdependHS
@@ -37,7 +40,7 @@ import Maybe
        -- flags
 GLOBAL_VAR(v_Dep_makefile,             "Makefile", String);
 GLOBAL_VAR(v_Dep_include_prelude,      False, Bool);
-GLOBAL_VAR(v_Dep_exclude_mods,          [], [String]);
+GLOBAL_VAR(v_Dep_exclude_mods,          ["GHC.Prim"], [String]);
 GLOBAL_VAR(v_Dep_suffixes,             [], [String]);
 GLOBAL_VAR(v_Dep_warnings,             True, Bool);
 
@@ -168,12 +171,33 @@ findDependency is_source src imp = do
    if imp_mod `elem` excl_mods 
       then return Nothing
       else do
-       r <- findModuleDep imp is_source
+       r <- findModule imp
        case r of 
-          Just (mod,loc)
-               | isHomeModule mod || include_prelude
-               -> return (Just (ml_hi_file loc, not is_source))
-               | otherwise 
+          Right (mod,loc)
+               -- not in this package: we don't need a dependency
+               | not (isHomeModule mod) && not include_prelude
                -> return Nothing
-          Nothing -> throwDyn (ProgramError 
-               (src ++ ": " ++ "can't locate import `" ++ imp_mod ++ "'"))
+
+               -- normal import: just depend on the .hi file
+               | not is_source
+               -> return (Just (ml_hi_file loc, not is_source))
+
+               -- if it's a source import, we want to generate a dependency
+               -- on the .hi-boot file, not the .hi file
+               | otherwise
+               -> let hi_file = ml_hi_file loc
+                      boot_hi_file = replaceFilenameSuffix hi_file hiBootExt 
+                      boot_ver_hi_file = replaceFilenameSuffix hi_file hiBootVerExt 
+                  in do
+                  b <- doesFileExist boot_ver_hi_file
+                  if b 
+                    then return (Just (boot_ver_hi_file, not is_source))
+                    else do
+                       b <- doesFileExist boot_hi_file
+                       if b 
+                          then return (Just (boot_hi_file, not is_source))
+                          else return (Just (hi_file, not is_source))
+
+          Left _ -> throwDyn (ProgramError 
+               (src ++ ": " ++ "can't locate import `" ++ imp_mod ++ "'" ++
+                if is_source then " (SOURCE import)" else ""))