Deprecate the -#include flag

[ghc-hetmet.git] / compiler / main / Finder.lhs

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index cc19e31..21d7feb 100644 (file)
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -32,12 +32,13 @@ import Packages
 import FastString
 import Util
 import PrelNames        ( gHC_PRIM )
-import DynFlags                ( DynFlags(..), isOneShot, GhcMode(..) )
+import DynFlags
 import Outputable
 import FiniteMap
 import LazyUniqFM
 import Maybes          ( expectJust )
 
+import Distribution.Text
 import Distribution.Package hiding (PackageId)
 import Data.IORef      ( IORef, writeIORef, readIORef, modifyIORef )
 import System.Directory
@@ -180,10 +181,10 @@ findExposedPackageModule hsc_env mod_name mb_pkg
   | null found_exposed = return (NotFound [] Nothing mod_hiddens pkg_hiddens)
         -- found in just one exposed package:
   | [(pkg_conf, _)] <- found_exposed
-        = let pkgid = mkPackageId (package pkg_conf) in      
+        = let pkgid = packageConfigId pkg_conf in
           findPackageModule_ hsc_env (mkModule pkgid mod_name) pkg_conf
   | otherwise
-        = return (FoundMultiple (map (mkPackageId.package.fst) found_exposed))
+        = return (FoundMultiple (map (packageConfigId.fst) found_exposed))
   where
        dflags = hsc_dflags hsc_env
         found = lookupModuleInAllPackages dflags mod_name
@@ -196,10 +197,10 @@ findExposedPackageModule hsc_env mod_name mb_pkg
 
         is_exposed (pkg_conf,exposed_mod) = exposed pkg_conf && exposed_mod
 
-        mod_hiddens = [ mkPackageId (package pkg_conf)
+        mod_hiddens = [ packageConfigId pkg_conf
                       | (pkg_conf,False) <- found ]
 
-        pkg_hiddens = [ mkPackageId (package pkg_conf)
+        pkg_hiddens = [ packageConfigId pkg_conf
                       | (pkg_conf,_) <- found, not (exposed pkg_conf) ]
 
         _pkg_conf `matches` Nothing  = True
@@ -599,7 +600,17 @@ cantFindErr cannot_find _ dflags mod_name find_result
                hang (ptext (sLit "locations searched:")) 2 $ vcat (map text files)
         
     pkg_hidden pkg =
-        ptext (sLit "it is a member of the hidden package") <+> quotes (ppr pkg)
+        ptext (sLit "It is a member of the hidden package") <+> quotes (ppr pkg)
+        <> dot $$ cabal_pkg_hidden_hint pkg
+    cabal_pkg_hidden_hint pkg
+     | dopt Opt_BuildingCabalPackage dflags
+        = case simpleParse (packageIdString pkg) of
+          Just pid ->
+              ptext (sLit "Perhaps you need to add") <+>
+              quotes (text (display (pkgName pid))) <+>
+              ptext (sLit "to the build-depends in your .cabal file.")
+          Nothing -> empty
+     | otherwise = empty
 
     mod_hidden pkg =
         ptext (sLit "it is a hidden module in the package") <+> quotes (ppr pkg)