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
4be3e3f9
Commit
4be3e3f9
authored
Jun 05, 2009
by
Ian Lynagh
Browse files
Follow Cabal changes
parent
77a4675a
Changes
1
Hide whitespace changes
Inline
Side-by-side
utils/ghc-cabal/ghc-cabal.hs
View file @
4be3e3f9
...
...
@@ -198,11 +198,12 @@ generate config_args distdir directory
-- generate inplace-pkg-config
when
(
isJust
$
library
pd
)
$
writeInstalledConfig
distdir
pd
lbi
True
Nothing
writeInstalledConfig
distdir
pd
lbi
True
(
distdir
</>
"inplace-pkg-config"
)
let
libBiModules
lib
=
(
libBuildInfo
lib
,
libModules
pd
)
exeBiModules
exe
=
(
buildInfo
exe
,
ModuleName
.
main
:
exeModules
pd
)
libBiModules
lib
=
(
libBuildInfo
lib
,
libModules
lib
)
exeBiModules
exe
=
(
buildInfo
exe
,
ModuleName
.
main
:
exeModules
exe
)
biModuless
=
(
maybeToList
$
fmap
libBiModules
$
library
pd
)
++
(
map
exeBiModules
$
executables
pd
)
buildableBiModuless
=
filter
isBuildable
biModuless
...
...
@@ -236,8 +237,8 @@ generate config_args distdir directory
let
xs
=
[
variablePrefix
++
"_VERSION = "
++
display
(
pkgVersion
(
package
pd
)),
variablePrefix
++
"_MODULES = "
++
unwords
(
map
display
modules
),
variablePrefix
++
"_HS_SRC_DIRS = "
++
unwords
(
hsSourceDirs
bi
),
variablePrefix
++
"_DEPS = "
++
unwords
(
map
display
(
p
ackageDeps
lbi
)),
variablePrefix
++
"_DEP_NAMES = "
++
unwords
(
map
(
display
.
packageName
)
(
p
ackageDeps
lbi
)),
variablePrefix
++
"_DEPS = "
++
unwords
(
map
display
(
externalP
ackageDeps
lbi
)),
variablePrefix
++
"_DEP_NAMES = "
++
unwords
(
map
(
display
.
packageName
)
(
externalP
ackageDeps
lbi
)),
variablePrefix
++
"_INCLUDE_DIRS = "
++
unwords
(
includeDirs
bi
),
variablePrefix
++
"_INCLUDES = "
++
unwords
(
includes
bi
),
variablePrefix
++
"_INSTALL_INCLUDES = "
++
unwords
(
installIncludes
bi
),
...
...
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