diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-12-21 15:04:05 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-12-22 12:08:54 -0500 |
| commit | e237e1f132d0c0e1d9bf24d21cf688110305fb28 (patch) | |
| tree | b83debb239fd2879a3bd7a806d9b06eac9d9a4b1 /utils/ghc-cabal | |
| parent | 6549706ffe47a18edb22e810d7e136a72891c161 (diff) | |
| download | haskell-e237e1f132d0c0e1d9bf24d21cf688110305fb28.tar.gz | |
Bump Cabal submodule
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 6 |
1 files changed, 3 insertions, 3 deletions
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 |