X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=d34b0f3b5b7a9aeaac6c4f9e0553f07835f7d799;hb=85174045bbcc05adb28447d423794d1f087da59e;hp=2167035c9d50d419a7ccae45a0a3b9afe8ffe6ef;hpb=2bbec92eb827c0d70b25f4006a954d95ae3088bf;p=ghc-hetmet.git diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 2167035..d34b0f3 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -1929,7 +1929,7 @@ findModule' hsc_env mod_name maybe_pkg = case lookupUFM hpt mod_name of Just mod_info -> return (mi_module (hm_iface mod_info)) _not_a_home_module -> do - res <- findImportedModule hsc_env mod_name Nothing + res <- findImportedModule hsc_env mod_name maybe_pkg case res of Found _ m | modulePackageId m /= this_pkg -> return m | otherwise -> throwDyn (CmdLineError (showSDoc $ @@ -2206,6 +2206,9 @@ sandboxIO thing = do foreign import "rts_evalStableIO" {- safe -} rts_evalStableIO :: StablePtr (IO a) -> Ptr (StablePtr a) -> IO CInt -- more informative than the C type! + +XXX the type of rts_evalStableIO no longer matches the above + -}