diff options
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 97c66f2c7698f0aea4277acb66b918b7341b3d0 +Subproject 3f20e1faf9bc86ecb154ccf3e8b913bff14b926 diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 440ab0b7d0..f330ce06c3 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -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 |