X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FFinder.lhs;h=b76bd972e7bbcf4dd67b99f39f75c827f2cc3242;hp=61bf196e19063cd47564fa5ed020471d5a49021f;hb=4c6a3f787abcaed009a574196d82237d9ae64fc8;hpb=7eb5e29b4a7b6fef55512bc7bf3308e712ca3eba

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index 61bf196..b76bd97 100644
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -36,7 +36,7 @@ import PrelNames        ( gHC_PRIM )
 import DynFlags		( DynFlags(..), isOneShot, GhcMode(..) )
 import Outputable
 import FiniteMap
-import UniqFM
+import LazyUniqFM
 import Maybes		( expectJust )
 
 import Data.IORef	( IORef, writeIORef, readIORef, modifyIORef )
@@ -481,9 +481,9 @@ mkStubPaths dflags mod location
   = let
         stubdir = stubDir dflags
 
-		mod_basename = dots_to_slashes (moduleNameString mod)
-		src_basename = basenameOf (expectJust "mkStubPaths" 
-						(ml_hs_file location))
+        mod_basename = moduleNameSlashes mod
+        src_basename = dropExtension $ expectJust "mkStubPaths" 
+                                                  (ml_hs_file location)
 
         stub_basename0
             | Just dir <- stubdir = dir </> mod_basename
@@ -532,12 +532,6 @@ findObjectLinkable mod obj_fn obj_time = do
 	else return (LM obj_time mod [DotO obj_fn])
 
 -- -----------------------------------------------------------------------------
--- Utils
-
-dots_to_slashes :: String -> String
-dots_to_slashes = map (\c -> if c == '.' then '/' else c)
-
--- -----------------------------------------------------------------------------
 -- Error messages
 
 cannotFindModule :: DynFlags -> ModuleName -> FindResult -> SDoc