Skip to content
Snippets Groups Projects
Commit c6cf13ca authored by Ben Gamari's avatar Ben Gamari
Browse files

Bump Cabal submodule

(cherry picked from commit e237e1f1)
parent 93e6ddd7
No related branches found
No related tags found
No related merge requests found
Subproject commit 97c66f2c7698f0aea4277acb66b918b7341b3d01
Subproject commit 3f20e1faf9bc86ecb154ccf3e8b913bff14b9264
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment