[project @ 2004-09-08 08:47:54 by simonmar]

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

diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs
index 3faa06c..87bdcd3 100644 (file)
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/ghc/compiler/main/DriverMkDepend.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverMkDepend.hs,v 1.29 2003/07/17 12:04:53 simonmar Exp $
+-- $Id: DriverMkDepend.hs,v 1.32 2004/06/24 09:41:11 simonmar Exp $
 --
 -- GHC Driver
 --
@@ -7,7 +7,9 @@
 --
 -----------------------------------------------------------------------------
 
-module DriverMkDepend where
+module DriverMkDepend (
+       doMkDependHSPhase, beginMkDependHS, endMkDependHS
+  ) where
 
 #include "HsVersions.h"
 
@@ -21,7 +23,7 @@ import Module         ( ModuleName, ModLocation(..),
                          moduleNameUserString, isHomeModule )
 import Finder          ( findModule, hiBootExt, hiBootVerExt,
                          mkHomeModLocation )
-import Util             ( global )
+import Util             ( global, maybePrefixMatch )
 import Panic
 
 import DATA_IOREF      ( IORef, readIORef, writeIORef )
@@ -133,25 +135,23 @@ beginMkDependHS = do
 doMkDependHSPhase basename suff input_fn
  = do src <- readFile input_fn
       let (import_sources, import_normals, mod_name) = getImports src
-      (_, location') <- mkHomeModLocation mod_name "." basename suff
+      let orig_fn = basename ++ '.':suff
+      (_, location') <- mkHomeModLocation mod_name orig_fn
 
       -- take -ohi into account if present
       ohi <- readIORef v_Output_hi
       let location | Just fn <- ohi = location'{ ml_hi_file = fn }
                   | otherwise      = location'
 
-      let orig_fn = basename ++ '.':suff
       deps_sources <- mapM (findDependency True  orig_fn) import_sources
       deps_normals <- mapM (findDependency False orig_fn) import_normals
       let deps = deps_sources ++ deps_normals
 
       osuf <- readIORef v_Object_suf
-
       extra_suffixes <- readIORef v_Dep_suffixes
-      let suffixes = osuf : map (++ ('_':osuf)) extra_suffixes
-          ofiles = map (\suf -> basename ++ '.':suf) suffixes
-
-      objs <- mapM odir_ify ofiles
+      let suffixes = map (++ ('_':osuf)) extra_suffixes
+         obj_file = ml_obj_file location
+          objs = obj_file : map (replaceFilenameSuffix obj_file) suffixes
 
        -- Handle for file that accumulates dependencies 
       hdl <- readIORef v_Dep_tmp_hdl
@@ -165,9 +165,25 @@ doMkDependHSPhase basename suff input_fn
                            escapeSpaces dep)
           genDep (dep, True  {- is an hi file -}) = do
             hisuf <- readIORef v_Hi_suf
-            let dep_base = remove_suffix '.' dep
-                deps = (dep_base ++ hisuf)
-                       : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes
+            let 
+               -- In order to construct hi files with alternate suffixes, we
+               -- now have to find the "basename" of the hi file.  This is
+               -- difficult because we can't just split the hi filename
+               -- at the last dot - the hisuf might have dots in it.  So we
+               -- check whether the hi filename ends in hisuf, and if it does,
+               -- we strip off hisuf, otherwise we strip everything after the
+               -- last dot.
+               dep_base 
+                  | Just rest <- maybePrefixMatch rev_hisuf rev_dep
+                  = reverse rest
+                  | otherwise
+                  = remove_suffix '.' dep
+                 where
+                       rev_hisuf = reverse hisuf
+                       rev_dep   = reverse dep
+
+               deps = dep : map (\suf -> dep_base ++ suf ++ '_':hisuf) 
+                               extra_suffixes
                  -- length objs should be == length deps
             sequence_ (zipWith (\o d -> hPutStrLn hdl (escapeSpaces o ++ " : " ++ escapeSpaces d)) objs deps)