Bump Cabal submodule
authorBen Gamari <ben@smart-cactus.org>
Thu, 21 Dec 2017 20:04:05 +0000 (15:04 -0500)
committerBen Gamari <ben@smart-cactus.org>
Fri, 22 Dec 2017 17:16:49 +0000 (12:16 -0500)
(cherry picked from commit e237e1f132d0c0e1d9bf24d21cf688110305fb28)

libraries/Cabal
utils/ghc-cabal/Main.hs

index 97c66f2..3f20e1f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 97c66f2c7698f0aea4277acb66b918b7341b3d01
+Subproject commit 3f20e1faf9bc86ecb154ccf3e8b913bff14b9264
index 440ab0b..f330ce0 100644 (file)
@@ -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