Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
b9a124cf
Commit
b9a124cf
authored
Mar 07, 2008
by
Duncan Coutts
Browse files
Make BuildInfo an instance of Monoid
parent
11dc13ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Distribution/PackageDescription.hs
View file @
b9a124cf
...
...
@@ -63,7 +63,6 @@ module Distribution.PackageDescription (
BuildInfo
(
..
),
emptyBuildInfo
,
allBuildInfo
,
unionBuildInfo
,
hcOptions
,
-- ** Supplementary build information
...
...
@@ -299,6 +298,10 @@ data BuildInfo = BuildInfo {
}
deriving
(
Show
,
Read
,
Eq
)
instance
Monoid
BuildInfo
where
mempty
=
nullBuildInfo
mappend
=
unionBuildInfo
nullBuildInfo
::
BuildInfo
nullBuildInfo
=
BuildInfo
{
buildable
=
True
,
...
...
Distribution/Simple/Configure.hs
View file @
b9a124cf
...
...
@@ -68,8 +68,7 @@ import Distribution.Simple.PackageIndex (PackageIndex)
import
Distribution.PackageDescription
as
PD
(
PackageDescription
(
..
),
GenericPackageDescription
(
..
)
,
Library
(
..
),
hasLibs
,
Executable
(
..
),
BuildInfo
(
..
)
,
HookedBuildInfo
,
updatePackageDescription
,
allBuildInfo
,
emptyBuildInfo
,
unionBuildInfo
)
,
HookedBuildInfo
,
updatePackageDescription
,
allBuildInfo
)
import
Distribution.PackageDescription.Configuration
(
finalizePackageDescription
)
import
Distribution.PackageDescription.Check
...
...
@@ -120,6 +119,8 @@ import Data.List
(
nub
,
partition
,
isPrefixOf
,
maximumBy
)
import
Data.Maybe
(
fromMaybe
,
isNothing
)
import
Data.Monoid
(
Monoid
(
..
)
)
import
System.Directory
(
doesFileExist
,
getModificationTime
,
createDirectoryIfMissing
)
import
System.Exit
...
...
@@ -550,11 +551,11 @@ configurePkgconfigPackages verbosity pkg_descr conf
updateLibrary
Nothing
=
return
Nothing
updateLibrary
(
Just
lib
)
=
do
bi
<-
pkgconfigBuildInfo
(
pkgconfigDepends
(
libBuildInfo
lib
))
return
$
Just
lib
{
libBuildInfo
=
libBuildInfo
lib
`
unionBuildInfo
`
bi
}
return
$
Just
lib
{
libBuildInfo
=
libBuildInfo
lib
`
mappend
`
bi
}
updateExecutable
exe
=
do
bi
<-
pkgconfigBuildInfo
(
pkgconfigDepends
(
buildInfo
exe
))
return
exe
{
buildInfo
=
buildInfo
exe
`
unionBuildInfo
`
bi
}
return
exe
{
buildInfo
=
buildInfo
exe
`
mappend
`
bi
}
pkgconfigBuildInfo
::
[
Dependency
]
->
IO
BuildInfo
pkgconfigBuildInfo
pkgdeps
=
do
...
...
@@ -578,7 +579,7 @@ ccLdOptionsBuildInfo cflags ldflags =
let
(
includeDirs'
,
cflags'
)
=
partition
(
"-I"
`
isPrefixOf
`)
cflags
(
extraLibs'
,
ldflags'
)
=
partition
(
"-l"
`
isPrefixOf
`)
ldflags
(
extraLibDirs'
,
ldflags''
)
=
partition
(
"-L"
`
isPrefixOf
`)
ldflags'
in
empty
BuildInfo
{
in
m
empty
{
PD
.
includeDirs
=
map
(
drop
2
)
includeDirs'
,
PD
.
extraLibs
=
map
(
drop
2
)
extraLibs'
,
PD
.
extraLibDirs
=
map
(
drop
2
)
extraLibDirs'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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