Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4,249
Issues
4,249
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
393
Merge Requests
393
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
bd544d3d
Commit
bd544d3d
authored
Dec 27, 2019
by
Ben Gamari
🐢
Committed by
Marge Bot
Dec 30, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hadrian: Track hash of Cabal Setup builder arguments
Lest we fail to rebuild when they change. Fixes
#17611
.
parent
5baa2a43
Pipeline
#14100
failed with stages
in 125 minutes and 55 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+6
-1
No files found.
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
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
...
...
Marge Bot
💬
@marge-bot
mentioned in merge request
!2379 (closed)
·
Dec 30, 2019
mentioned in merge request
!2379 (closed)
mentioned in merge request !2379
Toggle commit list
Write
Preview
Markdown
is supported
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