Commit 951dad7b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Alter the base:GHC.Prim hack in installPackage, following changes in base

parent 9fddc216
......@@ -52,20 +52,18 @@ doit verbosity ghcpkg ghcpkgconf destdir topdir
lbi <- getConfig verbosity
let pd = localPkgDescr lbi
i = installDirTemplates lbi
-- XXX This is an almighty hack, shadowing the base
-- Setup.hs hack
mkLib filt = case library pd of
-- This is an almighty hack. We need to register
-- base:GHC.Prim, but it doesn't exist, get built, get
-- haddocked, get copied, etc.
pd_reg = if pkgName (package pd) == "base"
then case library pd of
Just lib ->
let ems = filter filt $ exposedModules lib
in lib {
exposedModules = ems
}
let ems = "GHC.Prim" : exposedModules lib
lib' = lib { exposedModules = ems }
in pd { library = Just lib' }
Nothing ->
error "Expected a library, but none found"
-- There's no files for GHC.Prim, so we will fail if we
-- try to copy them
pd_copy = pd { library = Just (mkLib ("GHC.Prim" /=)) }
pd_reg = pd { library = Just (mkLib (const True)) }
else pd
-- When coying, we need to actually give a concrete
-- directory to copy to rather than "$topdir"
toPathTemplate' = toPathTemplate . replaceTopdir topdir
......@@ -102,7 +100,7 @@ doit verbosity ghcpkg ghcpkgconf destdir topdir
}
lbi_reg = lbi { installDirTemplates = i_reg,
withPrograms = progs' }
(copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
(copyHook simpleUserHooks) pd lbi_copy userHooks copyFlags
(regHook simpleUserHooks) pd_reg lbi_reg userHooks registerFlags
return ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment