diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-02-20 11:11:03 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-02-20 13:33:45 -0500 |
| commit | 087dbbedc4caaf96cd92d88f3c334fbf912658c3 (patch) | |
| tree | 0f0b7d9a4ade31fdfbad3a12d3ed78afb1ae8baf /utils/ghc-cabal | |
| parent | 27a2854124cc1c101570104501beea234a4ee921 (diff) | |
| download | haskell-087dbbedc4caaf96cd92d88f3c334fbf912658c3.tar.gz | |
Bump Cabal submodule
We are now tracking the 2.0 branch.
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index d65ffba0e6..2c20432b5f 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -21,7 +21,7 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, - Cabal >= 1.25 && < 1.27, + Cabal >= 2.0 && < 2.1, directory >= 1.1 && < 1.4, filepath >= 1.2 && < 1.5 diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 4f896aab9c..b8f03a9da2 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -54,7 +54,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b -no-user-$(GHC_PACKAGE_DB_FLAG) \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -DCABAL_VERSION=$(CABAL_VERSION) \ - -DMIN_VERSION_binary_0_8_0 \ + -DHAVE_containers_050 \ -DBOOTSTRAPPING \ -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \ -odir bootstrapping \ |