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
Packages
Cabal
Commits
4220ffb5
Commit
4220ffb5
authored
Jan 27, 2017
by
Edward Z. Yang
Committed by
Edward Z. Yang
Feb 02, 2017
Browse files
Restore BC for initialBuildSteps.
Fixes #4273. Signed-off-by:
Edward Z. Yang
<
ezyang@cs.stanford.edu
>
parent
8977b657
Changes
2
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/Build.hs
View file @
4220ffb5
...
...
@@ -23,6 +23,7 @@ module Distribution.Simple.Build (
startInterpreter
,
initialBuildSteps
,
componentInitialBuildSteps
,
writeAutogenFiles
,
)
where
...
...
@@ -105,7 +106,7 @@ build pkg_descr lbi flags suffixes = do
(
\
f
->
foldM_
f
(
installedPkgs
lbi
)
componentsToBuild
)
$
\
index
target
->
do
let
comp
=
targetComponent
target
clbi
=
targetCLBI
target
i
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
componentI
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
let
bi
=
componentBuildInfo
comp
progs'
=
addInternalBuildTools
pkg_descr
lbi
bi
(
withPrograms
lbi
)
lbi'
=
lbi
{
...
...
@@ -157,7 +158,7 @@ repl pkg_descr lbi flags suffixes args = do
[
do
let
clbi
=
targetCLBI
subtarget
comp
=
targetComponent
subtarget
lbi'
=
lbiForComponent
comp
lbi
i
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
componentI
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
buildComponent
verbosity
NoFlag
pkg_descr
lbi'
suffixes
comp
clbi
distPref
|
subtarget
<-
init
componentsToBuild
]
...
...
@@ -166,7 +167,7 @@ repl pkg_descr lbi flags suffixes args = do
let
clbi
=
targetCLBI
target
comp
=
targetComponent
target
lbi'
=
lbiForComponent
comp
lbi
i
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
componentI
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
replComponent
verbosity
pkg_descr
lbi'
suffixes
comp
clbi
distPref
...
...
@@ -605,13 +606,24 @@ replFLib verbosity pkg_descr lbi exe clbi =
GHC
->
GHC
.
replFLib
verbosity
NoFlag
pkg_descr
lbi
exe
clbi
_
->
die
"A REPL is not supported for this compiler."
-- | Runs 'componentInitialBuildSteps' on every configured component.
initialBuildSteps
::
FilePath
-- ^"dist" prefix
->
PackageDescription
-- ^mostly information from the .cabal file
->
LocalBuildInfo
-- ^Configuration information
->
Verbosity
-- ^The verbosity to use
->
IO
()
initialBuildSteps
distPref
pkg_descr
lbi
verbosity
=
withAllComponentsInBuildOrder
pkg_descr
lbi
$
\
_comp
clbi
->
componentInitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
-- | Creates the autogenerated files for a particular configured component.
componentInitialBuildSteps
::
FilePath
-- ^"dist" prefix
->
PackageDescription
-- ^mostly information from the .cabal file
->
LocalBuildInfo
-- ^Configuration information
->
ComponentLocalBuildInfo
->
Verbosity
-- ^The verbosity to use
->
IO
()
i
nitialBuildSteps
_distPref
pkg_descr
lbi
clbi
verbosity
=
do
componentI
nitialBuildSteps
_distPref
pkg_descr
lbi
clbi
verbosity
=
do
createDirectoryIfMissingVerbose
verbosity
True
(
componentBuildDir
lbi
clbi
)
writeAutogenFiles
verbosity
pkg_descr
lbi
clbi
...
...
Cabal/Distribution/Simple/Haddock.hs
View file @
4220ffb5
...
...
@@ -194,7 +194,7 @@ haddock pkg_descr lbi suffixes flags' = do
,
fromPackageDescription
haddockTarget
pkg_descr
]
withAllComponentsInBuildOrder
pkg_descr
lbi
$
\
component
clbi
->
do
i
nitialBuildSteps
(
flag
haddockDistPref
)
pkg_descr
lbi
clbi
verbosity
componentI
nitialBuildSteps
(
flag
haddockDistPref
)
pkg_descr
lbi
clbi
verbosity
preprocessComponent
pkg_descr
component
lbi
clbi
False
verbosity
suffixes
let
doExe
com
=
case
(
compToExe
com
)
of
...
...
@@ -682,7 +682,7 @@ hscolour' onNoHsColour haddockTarget pkg_descr lbi suffixes flags =
hscolourPref
haddockTarget
distPref
pkg_descr
withAllComponentsInBuildOrder
pkg_descr
lbi
$
\
comp
clbi
->
do
i
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
componentI
nitialBuildSteps
distPref
pkg_descr
lbi
clbi
verbosity
preprocessComponent
pkg_descr
comp
lbi
clbi
False
verbosity
suffixes
let
doExe
com
=
case
(
compToExe
com
)
of
...
...
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