diff options
| author | Alejandro Serrano <trupill@gmail.com> | 2015-07-27 17:05:10 +0200 |
|---|---|---|
| committer | Alejandro Serrano <trupill@gmail.com> | 2015-07-27 17:05:10 +0200 |
| commit | a87bb2b35a9af784de688fe50cc2daea3090f5de (patch) | |
| tree | d240e225f7a0754f58302f25f79cecb409981775 /ghc/Main.hs | |
| parent | 6b05f0c574a5067cbd6db5909e34d66c3512aa8f (diff) | |
| parent | 474d4ccc6e4a3bea93be16cb7daef6ffcdf9b663 (diff) | |
| download | haskell-a87bb2b35a9af784de688fe50cc2daea3090f5de.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/impredicativity
Conflicts:
compiler/typecheck/Inst.hs
compiler/typecheck/TcBinds.hs
compiler/typecheck/TcExpr.hs
compiler/typecheck/TcRnTypes.hs
compiler/types/Unify.hs
Diffstat (limited to 'ghc/Main.hs')
| -rw-r--r-- | ghc/Main.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index fa266a24f8..201ee5d8d2 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -834,11 +834,12 @@ abiHash strs = do let modname = mkModuleName str r <- findImportedModule hsc_env modname Nothing case r of - Found _ m -> return m + FoundModule h -> return [fr_mod h] + FoundSigs hs _ -> return (map fr_mod hs) _error -> throwGhcException $ CmdLineError $ showSDoc dflags $ cannotFindInterface dflags modname r - mods <- mapM find_it strs + mods <- fmap concat (mapM find_it strs) let get_iface modl = loadUserInterface False (text "abiHash") modl ifaces <- initIfaceCheck hsc_env $ mapM get_iface mods |