diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2016-03-08 10:58:49 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2016-03-09 23:11:57 +0100 |
| commit | 374f9199e33b62a4d8ae49e4efbd7d9ad17fce58 (patch) | |
| tree | bec00c9d35ce5c0f317758505295c51ac59c74c2 /utils | |
| parent | 5a494d8ec688e42601262913172f24cee7a36c9b (diff) | |
| download | haskell-374f9199e33b62a4d8ae49e4efbd7d9ad17fce58.tar.gz | |
Update Cabal submodule to latest HEAD snapshot
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/check-api-annotations/check-api-annotations.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghctags/Main.hs | 2 | ||||
| -rw-r--r-- | utils/ghctags/ghctags.cabal | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/utils/check-api-annotations/check-api-annotations.cabal b/utils/check-api-annotations/check-api-annotations.cabal index ade5fe451f..da68dba985 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 d6048a3cb2..1f328d8557 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 ccdd327217..0eff514b70 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 d73c7fa0ee..b871f8cc11 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 |