diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 11:03:10 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-14 21:40:49 -0700 |
| commit | b92a51f5e235fc22a9ae0d76735b50f095665fb7 (patch) | |
| tree | 27eb41de475255206185e68c535c2d899012fa1b /compiler/main/GhcMake.hs | |
| parent | 5b0191f74ab05b187f81ea037623338a615b1619 (diff) | |
| download | haskell-b92a51f5e235fc22a9ae0d76735b50f095665fb7.tar.gz | |
Rename package key to unit ID, and installed package ID to component ID.
Comes with Haddock submodule update.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'compiler/main/GhcMake.hs')
| -rw-r--r-- | compiler/main/GhcMake.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs index 123cc9e212..65df44b83d 100644 --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -1625,7 +1625,7 @@ downsweep hsc_env old_summaries excl_mods allow_dup_roots calcDeps summ | HsBootFile <- ms_hsc_src summ , Just m <- getSigOf (hsc_dflags hsc_env) (moduleName (ms_mod summ)) - , modulePackageKey m == thisPackage (hsc_dflags hsc_env) + , moduleUnitId m == thisPackage (hsc_dflags hsc_env) = (noLoc (moduleName m), NotBoot) : msDeps summ | otherwise = msDeps summ @@ -1920,7 +1920,7 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod) just_found location mod | otherwise -> -- Drop external-pkg - ASSERT(modulePackageKey mod /= thisPackage dflags) + ASSERT(moduleUnitId mod /= thisPackage dflags) return Nothing err -> return $ Just $ Left $ noModError dflags loc wanted_mod err |