projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
62e61e0
)
Fix ghc-cabal, so that GHC.Prim gets registered when we install
author
Ian Lynagh
<igloo@earth.li>
Thu, 4 Jun 2009 12:45:01 +0000
(12:45 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 4 Jun 2009 12:45:01 +0000
(12:45 +0000)
utils/ghc-cabal/ghc-cabal.hs
patch
|
blob
|
history
diff --git
a/utils/ghc-cabal/ghc-cabal.hs
b/utils/ghc-cabal/ghc-cabal.hs
index
c9c8764
..
24b25b1
100644
(file)
--- a/
utils/ghc-cabal/ghc-cabal.hs
+++ b/
utils/ghc-cabal/ghc-cabal.hs
@@
-109,13
+109,12
@@
doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
defaultMainWithHooksArgs hooks ("register" : "--builddir" : distDir : args)
where
hooks = userHooks {
defaultMainWithHooksArgs hooks ("register" : "--builddir" : distDir : args)
where
hooks = userHooks {
- copyHook = modHook (copyHook userHooks),
+ copyHook = noGhcPrimHook (modHook (copyHook userHooks)),
regHook = modHook (regHook userHooks)
}
regHook = modHook (regHook userHooks)
}
- modHook f pd lbi us flags
- = let
- pd'
+ noGhcPrimHook f pd lbi us flags
+ = let pd'
| packageName pd == PackageName "ghc-prim" =
case library pd of
Just lib ->
| packageName pd == PackageName "ghc-prim" =
case library pd of
Just lib ->
@@
-126,7
+125,9
@@
doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
Nothing ->
error "Expected a library, but none found"
| otherwise = pd
Nothing ->
error "Expected a library, but none found"
| otherwise = pd
- idts = installDirTemplates lbi
+ in f pd' lbi us flags
+ modHook f pd lbi us flags
+ = let idts = installDirTemplates lbi
idts' = idts { prefix = toPathTemplate myPrefix,
libdir = toPathTemplate myLibdir,
libsubdir = toPathTemplate "$pkgid",
idts' = idts { prefix = toPathTemplate myPrefix,
libdir = toPathTemplate myLibdir,
libsubdir = toPathTemplate "$pkgid",
@@
-147,7
+148,7
@@
doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
installDirTemplates = idts',
withPrograms = progs'
}
installDirTemplates = idts',
withPrograms = progs'
}
- in f pd' lbi' us flags
+ in f pd lbi' us flags
generate :: [String] -> FilePath -> FilePath -> IO ()
generate config_args distdir directory
generate :: [String] -> FilePath -> FilePath -> IO ()
generate config_args distdir directory