From cf0f7633e4f3ac33014a811c971e852b38f0e11e Mon Sep 17 00:00:00 2001 From: sewardj Date: Tue, 14 Nov 2000 15:03:46 +0000 Subject: [PATCH] [project @ 2000-11-14 15:03:46 by sewardj] Don't forget to prepend paths to source module names. --- ghc/compiler/main/Finder.lhs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ghc/compiler/main/Finder.lhs b/ghc/compiler/main/Finder.lhs index 387864f..ae4ff77 100644 --- a/ghc/compiler/main/Finder.lhs +++ b/ghc/compiler/main/Finder.lhs @@ -92,28 +92,33 @@ maybeHomeModule mod_name = do lhs = basename ++ ".lhs" case lookupFM home_map hs of { - Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) hs; + Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) + (path ++ '/':hs); Nothing -> case lookupFM home_map lhs of { - Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) lhs; + Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) + (path ++ '/':lhs); Nothing -> do -- can't find a source file anywhere, check for a lone .hi file. hisuf <- readIORef v_Hi_suf let hi = basename ++ '.':hisuf case lookupFM home_map hi of { - Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) hs; + Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) + (path ++ '/':hs); Nothing -> do -- last chance: .hi-boot and .hi-boot- let hi_boot = basename ++ ".hi-boot" let hi_boot_ver = basename ++ ".hi-boot-" ++ cHscIfaceFileVersion case lookupFM home_map hi_boot of { - Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) hs; + Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) + (path ++ '/':hs); Nothing -> do case lookupFM home_map hi_boot_ver of { - Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) hs; + Just path -> mkHomeModuleLocn mod_name (path ++ '/':basename) + (path ++ '/':hs); Nothing -> return Nothing }}}}} -- 1.7.10.4