Migrate cvs diff from fptools-assoc branch

[ghc-hetmet.git] / compiler / typecheck / TcEnv.lhs

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index c5d65c2..be1ce9b 100644 (file)
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -64,14 +64,11 @@ import InstEnv              ( Instance, DFunId, instanceDFunId, instanceHead )
 import DataCon         ( DataCon )
 import TyCon           ( TyCon )
 import Class           ( Class )
-import Name            ( Name, NamedThing(..), getSrcLoc, nameModule, isExternalName )
+import Name            ( Name, NamedThing(..), getSrcLoc, nameModule )
 import PrelNames       ( thFAKE )
 import NameEnv
 import OccName         ( mkDFunOcc, occNameString )
-import HscTypes                ( extendTypeEnvList, lookupType,
-                         TyThing(..), tyThingId, tyThingDataCon,
-                         ExternalPackageState(..) )
-
+import HscTypes                ( extendTypeEnvList, lookupType, TyThing(..), ExternalPackageState(..) )
 import SrcLoc          ( SrcLoc, Located(..) )
 import Outputable
 \end{code}
@@ -107,7 +104,8 @@ tcLookupGlobal name
         
                -- Try global envt
        { (eps,hpt) <- getEpsAndHpt
-       ; case lookupType hpt (eps_PTE eps) name of  {
+       ; dflags <- getDOpts
+       ; case lookupType dflags hpt (eps_PTE eps) name of  {
            Just thing -> return thing ;
            Nothing    -> do