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
c854a53b
Commit
c854a53b
authored
Jul 12, 2013
by
Mikhail Glushenkov
Browse files
Rename and rearrange some variables.
Based on discussion with
@dcoutts
.
parent
6d22b989
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/GHC.hs
View file @
c854a53b
...
...
@@ -917,9 +917,11 @@ buildExe verbosity _pkg_descr lbi
"-dynhisuf"
,
"dyn_hi"
,
"-dynosuf"
,
"dyn_o"
]
}
com
pile
Opts
|
withProfExe
lbi
=
profOpts
com
mon
Opts
|
withProfExe
lbi
=
profOpts
|
withDynExe
lbi
=
dynOpts
|
otherwise
=
staticOpts
compileOpts
|
useDynToo
=
dynTooOpts
|
otherwise
=
commonOpts
withStaticExe
=
(
not
$
withProfExe
lbi
)
&&
(
not
$
withDynExe
lbi
)
-- For building exe's that use TH with -prof or -dynamic we actually have
...
...
@@ -940,7 +942,7 @@ buildExe verbosity _pkg_descr lbi
|
isGhcDynamic
=
doingTH
&&
(
withProfExe
lbi
||
withStaticExe
)
|
otherwise
=
doingTH
&&
(
withProfExe
lbi
||
withDynExe
lbi
)
linkOpts
=
com
pile
Opts
`
mappend
`
mempty
{
linkOpts
=
com
mon
Opts
`
mappend
`
mempty
{
ghcOptLinkOptions
=
PD
.
ldOptions
exeBi
,
ghcOptLinkLibs
=
extraLibs
exeBi
,
ghcOptLinkLibPath
=
extraLibDirs
exeBi
,
...
...
@@ -953,9 +955,7 @@ buildExe verbosity _pkg_descr lbi
when
compileForTH
$
runGhcProg
compileTHOpts
{
ghcOptNoLink
=
toFlag
True
}
let
compileOpts'
|
useDynToo
=
dynTooOpts
|
otherwise
=
compileOpts
in
runGhcProg
compileOpts'
{
ghcOptNoLink
=
toFlag
True
}
runGhcProg
compileOpts
{
ghcOptNoLink
=
toFlag
True
}
-- build any C sources
unless
(
null
cSrcs
)
$
do
...
...
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