Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gershomb
GHC
Commits
bd544d3d
Commit
bd544d3d
authored
5 years ago
by
Ben Gamari
Committed by
Marge Bot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
hadrian: Track hash of Cabal Setup builder arguments
Lest we fail to rebuild when they change. Fixes #17611.
parent
5baa2a43
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+6
-1
6 additions, 1 deletion
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
with
6 additions
and
1 deletion
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+
6
−
1
View file @
bd544d3d
...
...
@@ -43,6 +43,7 @@ import Hadrian.Expression
import
Hadrian.Haskell.Cabal
import
Hadrian.Haskell.Cabal.Type
import
Hadrian.Oracles.Cabal
import
Hadrian.Oracles.ArgsHash
import
Hadrian.Target
import
Base
...
...
@@ -137,11 +138,15 @@ configurePackage context@Context {..} = do
pure
$
C
.
simpleUserHooks
{
C
.
postConf
=
\
_
_
_
_
->
return
()
}
|
otherwise
->
pure
C
.
simpleUserHooks
-- Compute the list of flags, and the Cabal configura
r
tion arguments
-- Compute the list of flags, and the Cabal configuration arguments
flavourArgs
<-
args
<$>
flavour
flagList
<-
interpret
(
target
context
(
Cabal
Flags
stage
)
[]
[]
)
flavourArgs
argList
<-
interpret
(
target
context
(
Cabal
Setup
stage
)
[]
[]
)
flavourArgs
trackArgsHash
(
target
context
(
Cabal
Flags
stage
)
[]
[]
)
trackArgsHash
(
target
context
(
Cabal
Setup
stage
)
[]
[]
)
verbosity
<-
getVerbosity
when
(
verbosity
>=
Loud
)
$
putProgressInfo
$
"| Package "
++
quote
(
pkgName
package
)
++
" configuration flags: "
++
unwords
argList
let
v
=
if
verbosity
>=
Loud
then
"-v3"
else
"-v0"
traced
"cabal-configure"
$
C
.
defaultMainWithHooksNoReadArgs
hooks
gpd
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment