[commit: ghc] master: Bump GHC version from 7.9 to 7.11 (8a02c5e)

git at git.haskell.org git at git.haskell.org
Mon Dec 22 17:11:53 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8a02c5e65c73b4b10a10198190fa815213445b73/ghc

>---------------------------------------------------------------

commit 8a02c5e65c73b4b10a10198190fa815213445b73
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 22 17:21:49 2014 +0100

    Bump GHC version from 7.9 to 7.11
    
    This needs to update the Haddock submodule as well
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


>---------------------------------------------------------------

8a02c5e65c73b4b10a10198190fa815213445b73
 compiler/utils/ExtsCompat46.hs | 2 +-
 configure.ac                   | 2 +-
 utils/haddock                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/utils/ExtsCompat46.hs b/compiler/utils/ExtsCompat46.hs
index a33fef5..14ffe72 100644
--- a/compiler/utils/ExtsCompat46.hs
+++ b/compiler/utils/ExtsCompat46.hs
@@ -90,7 +90,7 @@ import qualified GHC.Exts as E (
  )
 
 -- See #8330
-#if __GLASGOW_HASKELL__ > 710
+#if __GLASGOW_HASKELL__ > 711
 #error What is minimal version of GHC required for bootstraping? If it's GHC 7.8 we should remove this module and use GHC.Exts instead.
 #endif
 
diff --git a/configure.ac b/configure.ac
index 97fdc2f..8fadf30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.9], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/utils/haddock b/utils/haddock
index 7f23bd5..45acead 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 7f23bd526a6dd6ed0a2ddeeb30724606ea058ef5
+Subproject commit 45acead293f9fc18e984d2e83d137809359d506d



More information about the ghc-commits mailing list