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
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
Alexander Kaznacheev
GHC
Commits
c6cf13ca
Commit
c6cf13ca
authored
7 years ago
by
Ben Gamari
Browse files
Options
Downloads
Patches
Plain Diff
Bump Cabal submodule
(cherry picked from commit
e237e1f1
)
parent
93e6ddd7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/Cabal
+1
-1
1 addition, 1 deletion
libraries/Cabal
utils/ghc-cabal/Main.hs
+3
-3
3 additions, 3 deletions
utils/ghc-cabal/Main.hs
with
4 additions
and
4 deletions
Cabal
@
3f20e1fa
Compare
97c66f2c
...
3f20e1fa
Subproject commit
97c66f2c7698f0aea4277acb66b918b7341b3d01
Subproject commit
3f20e1faf9bc86ecb154ccf3e8b913bff14b9264
This diff is collapsed.
Click to expand it.
utils/ghc-cabal/Main.hs
+
3
−
3
View file @
c6cf13ca
...
...
@@ -95,11 +95,11 @@ runDefaultMain
gpdFile
<-
defaultPackageDesc
verbosity
gpd
<-
readPackageDescription
verbosity
gpdFile
case
buildType
(
flattenPackageDescription
gpd
)
of
Just
Configure
->
defaultMainWithHooks
autoconfUserHooks
Configure
->
defaultMainWithHooks
autoconfUserHooks
-- time has a "Custom" Setup.hs, but it's actually Configure
-- plus a "./Setup test" hook. However, Cabal is also
-- "Custom", but doesn't have a configure script.
Just
Custom
->
Custom
->
do
configureExists
<-
doesFileExist
"configure"
if
configureExists
then
defaultMainWithHooks
autoconfUserHooks
...
...
@@ -266,7 +266,7 @@ generate directory distdir config_args
writePersistBuildConfig
distdir
lbi
hooked_bi
<-
if
(
buildType
pd0
==
Just
Configure
)
||
(
buildType
pd0
==
Just
Custom
)
if
(
buildType
pd0
==
Configure
)
||
(
buildType
pd0
==
Custom
)
then
do
maybe_infoFile
<-
defaultHookedPackageDesc
case
maybe_infoFile
of
...
...
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