diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2016-05-04 20:43:12 +0200 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2016-05-04 21:55:01 +0200 |
| commit | c7eef63e8a33d7811ba9f242b5762dde55366526 (patch) | |
| tree | d3f4ad52698b990e970b182379a24c8c84dcfdd3 /CabalHelper/Main.hs | |
| parent | 93ea1d6aa14fb7f8a0d42cd167e3a363fc541066 (diff) | |
Fix Cabal-1.24.0.0
Diffstat (limited to 'CabalHelper/Main.hs')
| -rw-r--r-- | CabalHelper/Main.hs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs index 2170d30..f35ed3f 100644 --- a/CabalHelper/Main.hs +++ b/CabalHelper/Main.hs @@ -14,7 +14,7 @@ -- You should have received a copy of the GNU Affero General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. -{-# LANGUAGE CPP, BangPatterns, RecordWildCards #-} +{-# LANGUAGE CPP, BangPatterns, RecordWildCards, RankNTypes #-} {-# OPTIONS_GHC -fno-warn-deprecations #-} import Distribution.Simple.Utils (cabalVersion) import Distribution.Simple.Configure @@ -441,11 +441,19 @@ nubPackageFlags opts = opts nubPackageFlags opts = opts { ghcOptPackages = nub $ ghcOptPackages opts } #endif +renderGhcOptions' :: LocalBuildInfo + -> Verbosity + -> GhcOptions + -> IO [String] renderGhcOptions' lbi v opts = do #if CABAL_MAJOR == 1 && CABAL_MINOR < 20 (ghcProg, _) <- requireProgram v ghcProgram (withPrograms lbi) let Just ghcVer = programVersion ghcProg return $ renderGhcOptions ghcVer opts -#else +#elif CABAL_MAJOR == 1 && CABAL_MINOR >= 22 && CABAL_MINOR < 24 +-- && CABAL_MINOR < 24 return $ renderGhcOptions (compiler lbi) opts +#elif CABAL_MAJOR == 1 && CABAL_MINOR >= 24 +-- CABAL_MAJOR == 1 && CABAL_MINOR >= 24 + return $ renderGhcOptions (compiler lbi) (hostPlatform lbi) opts #endif |