[commit: ghc] ghc-8.0: Update submodule to Cabal-1.24 branch (b0f5a2a)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/b0f5a2ae378a6b2496bdd28bc416349c9cf56385/ghc

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

commit b0f5a2ae378a6b2496bdd28bc416349c9cf56385
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Mar 1 21:51:05 2016 +0100

    Update submodule to Cabal-1.24 branch
    
    ghc-8.0 now is officially tracking the 1.24 branch
    
    NB: `cabal submodule update --remote libraries/Cabal` will
        do the right thing now


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

b0f5a2ae378a6b2496bdd28bc416349c9cf56385
 .gitmodules                                             | 1 +
 libraries/Cabal                                         | 2 +-
 utils/check-api-annotations/check-api-annotations.cabal | 2 +-
 utils/ghc-cabal/ghc-cabal.cabal                         | 2 +-
 utils/ghctags/Main.hs                                   | 2 +-
 utils/ghctags/ghctags.cabal                             | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 29ca854..1b846b3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,7 @@
 	path = libraries/Cabal
 	url = ../packages/Cabal.git
 	ignore = untracked
+	branch = 1.24
 [submodule "libraries/containers"]
 	path = libraries/containers
 	url = ../packages/containers.git
diff --git a/libraries/Cabal b/libraries/Cabal
index 7aab356..df45e05 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 7aab3566e721c30ff5847a21051d5b5047176dc7
+Subproject commit df45e05eb249cd422afe1b406a3ed8eb0043bcb4
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index ade5fe4..89ed803 100644
--- a/utils/check-api-annotations/check-api-annotations.cabal
+++ b/utils/check-api-annotations/check-api-annotations.cabal
@@ -24,6 +24,6 @@ Executable check-api-annotations
 
     Build-Depends: base       >= 4   && < 5,
                    containers,
-                   Cabal      >= 1.22 && <1.24,
+                   Cabal      == 1.24.*,
                    directory,
                    ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index d6048a3..78a0f22 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.22 && < 1.24,
+                   Cabal      == 1.24.*,
                    directory  >= 1.1 && < 1.3,
                    filepath   >= 1.2 && < 1.5
 
diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs
index ccdd327..0eff514 100644
--- a/utils/ghctags/Main.hs
+++ b/utils/ghctags/Main.hs
@@ -188,7 +188,7 @@ flagsFromCabal distPref = do
       let bi = libBuildInfo lib
           odir = buildDir lbi
           opts = componentGhcOptions V.normal lbi bi clbi odir
-      in return $ renderGhcOptions (compiler lbi) opts
+      in return $ renderGhcOptions (compiler lbi) (hostPlatform lbi) opts
     _ -> error "no library"
 
 ----------------------------------------------------------------
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index d73c7fa..62eedb8 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -18,6 +18,6 @@ Executable ghctags
 
     Build-Depends: base       >= 4   && < 5,
                    containers,
-                   Cabal      >= 1.22 && <1.24,
+                   Cabal      == 1.24.*,
                    ghc