Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
4a82c60e
Commit
4a82c60e
authored
Sep 13, 2010
by
Simon Marlow
Browse files
filter out the gcc-lib directory from the rts package's library-dirs
fixes problems when building with GHC 6.10 on Windows
parent
d710c3a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
utils/ghc-cabal/ghc-cabal.hs
View file @
4a82c60e
...
...
@@ -328,7 +328,16 @@ generate config_args distdir directory
-- GHC's rts package:
hackRtsPackage
index
=
case
PackageIndex
.
lookupPackageName
index
(
PackageName
"rts"
)
of
[(
_
,[
rts
])]
->
PackageIndex
.
insert
rts
{
Installed
.
ldOptions
=
[]
}
index
[(
_
,[
rts
])]
->
PackageIndex
.
insert
rts
{
Installed
.
ldOptions
=
[]
,
Installed
.
libraryDirs
=
filter
(
not
.
(
"gcc-lib"
`
isSuffixOf
`))
(
Installed
.
libraryDirs
rts
)}
index
-- GHC <= 6.12 had $topdir/gcc-lib in their
-- library-dirs for the rts package, which causes
-- problems when we try to use the in-tree mingw,
-- due to accidentally picking up the incompatible
-- libraries there. So we filter out gcc-lib from
-- the RTS's library-dirs here.
_
->
error
"No (or multiple) ghc rts package is registered!!"
dep_ids
=
map
snd
(
externalPackageDeps
lbi
)
...
...
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