Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
db61aebd
Commit
db61aebd
authored
Jun 04, 2009
by
Ian Lynagh
Browse files
Fix ghc-cabal, so that GHC.Prim gets registered when we install
parent
62e61e0c
Changes
1
Hide whitespace changes
Inline
Side-by-side
utils/ghc-cabal/ghc-cabal.hs
View file @
db61aebd
...
...
@@ -109,13 +109,12 @@ doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
defaultMainWithHooksArgs
hooks
(
"register"
:
"--builddir"
:
distDir
:
args
)
where
hooks
=
userHooks
{
copyHook
=
modHook
(
copyHook
userHooks
),
copyHook
=
noGhcPrimHook
(
modHook
(
copyHook
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
->
...
...
@@ -126,7 +125,9 @@ doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
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"
,
...
...
@@ -147,7 +148,7 @@ doInstall ghcpkg ghcpkgconf directory distDir myDestDir myPrefix myLibdir myDocd
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment