diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DriverMkDepend.hs | 3 | ||||
| -rw-r--r-- | compiler/main/GhcMake.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs index c51feeb491..026afc6eb6 100644 --- a/compiler/main/DriverMkDepend.hs +++ b/compiler/main/DriverMkDepend.hs @@ -30,6 +30,7 @@ import Panic import SrcLoc import Data.List import FastString +import BasicTypes ( StringLiteral(..) ) import Exception import ErrUtils @@ -226,7 +227,7 @@ processDeps dflags hsc_env excl_mods root hdl (AcyclicSCC node) -- Emit a dependency for each import ; let do_imps is_boot idecls = sequence_ - [ do_imp loc is_boot (fmap snd $ ideclPkgQual i) mod + [ do_imp loc is_boot (fmap sl_fs $ ideclPkgQual i) mod | L loc i <- idecls, let mod = unLoc (ideclName i), mod `notElem` excl_mods ] diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index 89cab9ef3a..fbeb631cc8 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -1696,7 +1696,7 @@ msDeps s = home_imps :: [Located (ImportDecl RdrName)] -> [Located ModuleName] home_imps imps = [ ideclName i | L _ i <- imps, - isLocal (fmap snd $ ideclPkgQual i) ] + isLocal (fmap sl_fs $ ideclPkgQual i) ] where isLocal Nothing = True isLocal (Just pkg) | pkg == fsLit "this" = True -- "this" is special isLocal _ = False |