- -- When installing we need to use the non-inplace ghc-pkg.
- -- We also set the compiler to be non-inplace, but that
- -- probably doesn't matter.
- c = compiler lbi
- c' = c { compilerPath = dropInPlace (compilerPath c),
- compilerPkgTool = dropInPlace (compilerPkgTool c)
- }
- lbi' = lbi { compiler = c' }
- (instHook simpleUserHooks) pd' lbi' userHooks installFlags
-
-dropInPlace :: FilePath -> FilePath
-dropInPlace "" = ""
-dropInPlace xs@(x:xs') = case dropPrefix "-inplace" xs of
- Nothing -> x : dropInPlace xs'
- Just xs'' -> dropInPlace xs''
-
-dropPrefix :: Eq a => [a] -> [a] -> Maybe [a]
-dropPrefix [] ys = Just ys
-dropPrefix (x:xs) (y:ys)
- | x == y = dropPrefix xs ys
-dropPrefix _ _ = Nothing
+ -- When coying, we need to actually give a concrete
+ -- directory to copy to rather than "$topdir"
+ lbi_copy = lbi { prefix = pref }
+ -- When we run GHC we give it a $topdir that includes the
+ -- $compiler/lib/ part of libsubdir, so we only want the
+ -- $pkgid part in the package.conf file. This is a bit of
+ -- a hack, really.
+ lbi_register = lbi { libsubdir = "$pkgid" }
+ (copyHook simpleUserHooks) pd' lbi_copy userHooks copyFlags
+ (regHook simpleUserHooks) pd' lbi_register userHooks registerFlags
+ return ()