diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-15 11:09:45 +0200 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-16 17:00:40 +0200 |
commit | 8992d5269804b727fb77249511e89df678526907 (patch) | |
tree | d39461686c7a22c8415b0a8dd630a4457a983ba7 /utils/ghc-cabal/ghc-cabal.cabal | |
parent | a107737f84f6738a9fa572ec9c5da49c9db8a8b5 (diff) | |
download | haskell-8992d5269804b727fb77249511e89df678526907.tar.gz |
Update Cabal submodule to tip of v1.20 branch
This corresponds to the RC of the soon-to-be Cabal 1.20 release
One noteworthy change is the removal of the `--with-ranlib` flag
requiring a small adaptation in the GHC build system.
Moreover two new licences were added, MPL and BSD2.
Due to https://github.com/haskell/cabal/issues/1622 Cabal-1.20 now
allows to strip libraries as well, this doesn't work well with
`ghc-cabal copy` being fed a `":"` strip-command argument which was
simply ignored in the past. The current code tries to retain this
semantics as backward compat. However, this needs more investigation as
I'm not sure if/why the `test_bindist` step doesn't want the libraries
to be stripped on installation.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'utils/ghc-cabal/ghc-cabal.cabal')
-rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 10d6e0a9e4..74399ce390 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -17,7 +17,7 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, - Cabal >= 1.18 && < 1.19, + Cabal >= 1.20 && < 1.21, directory >= 1.1 && < 1.3, filepath >= 1.2 && < 1.4 |