summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2016-01-06 14:42:22 +0100
committerBen Gamari <ben@smart-cactus.org>2016-01-06 17:36:24 +0100
commit89ba83d981df3e56809440764cf81773bc33d00a (patch)
tree824ef1710acfc643c5d5b3dab7601641d05ad948
parentcac0795af33d622e4c6ebae6ae1f206969287088 (diff)
downloadhaskell-89ba83d981df3e56809440764cf81773bc33d00a.tar.gz
Bump Cabal and Haddock to fix #11308
Bump Cabal and Haddock submodules such that they both support GCC-style response files on Windows.
m---------libraries/Cabal0
-rw-r--r--testsuite/tests/driver/T4437.hs8
m---------utils/haddock0
3 files changed, 1 insertions, 7 deletions
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject bf4d05efa79a41a819e3d9278d5e9e1e5a055ce
+Subproject a8a121ea4d78783dd303dd2992d8e73ef337e7e
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 4120e91d99..f345ce6b1f 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,13 +32,7 @@ check title expected got
expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule",
- "AlternativeLayoutRuleTransitional",
- "OverloadedLabels",
- "UndecidableSuperClasses",
- "TemplateHaskellQuotes",
- "MonadFailDesugaring",
- "TypeInType",
- "TypeApplications"]
+ "AlternativeLayoutRuleTransitional"]
expectedCabalOnlyExtensions :: [String]
expectedCabalOnlyExtensions = ["Generics",
diff --git a/utils/haddock b/utils/haddock
-Subproject 6ddd758be0e7b50bd19d33400b3c3013d60786c
+Subproject a13d21c688cae176be4505a5a6e9d64739845ea