[commit: ghc] master: Update Cabal submodule to latest HEAD snapshot (374f919)

git at git.haskell.org git at git.haskell.org
Thu Mar 10 10:18:42 UTC 2016


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/374f9199e33b62a4d8ae49e4efbd7d9ad17fce58/ghc

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

commit 374f9199e33b62a4d8ae49e4efbd7d9ad17fce58
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Mar 8 10:58:49 2016 +0100

    Update Cabal submodule to latest HEAD snapshot


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

374f9199e33b62a4d8ae49e4efbd7d9ad17fce58
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index ecdf65a..9accafe 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit ecdf65a3c1e01b798e9d073258a6d1c8ff63a6d8
+Subproject commit 9accafebff3743fc499fa6d565d55ba25326db28
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal
index ade5fe4..da68dba 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.25 && <1.27,
                    directory,
                    ghc
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index d6048a3..1f328d8 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.25 && < 1.27,
                    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..b871f8c 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.25 && <1.27,
                    ghc
 



More information about the ghc-commits mailing list