Merge remote-tracking branch 'kazu/master'
This commit is contained in:
commit
3fb9163011
@ -107,11 +107,11 @@ Library
|
|||||||
, split
|
, split
|
||||||
, haskell-src-exts
|
, haskell-src-exts
|
||||||
, text
|
, text
|
||||||
if impl(ghc < 7.7)
|
if impl(ghc >= 7.8)
|
||||||
|
Build-Depends: Cabal >= 1.18
|
||||||
|
else
|
||||||
Build-Depends: convertible
|
Build-Depends: convertible
|
||||||
, Cabal >= 1.10 && < 1.17
|
, Cabal >= 1.10 && < 1.17
|
||||||
else
|
|
||||||
Build-Depends: Cabal >= 1.18
|
|
||||||
|
|
||||||
Executable ghc-mod
|
Executable ghc-mod
|
||||||
Default-Language: Haskell2010
|
Default-Language: Haskell2010
|
||||||
@ -191,12 +191,12 @@ Test-Suite spec
|
|||||||
, split
|
, split
|
||||||
, haskell-src-exts
|
, haskell-src-exts
|
||||||
, text
|
, text
|
||||||
if impl(ghc < 7.7)
|
if impl(ghc >= 7.8)
|
||||||
|
Build-Depends: Cabal >= 1.18
|
||||||
|
else
|
||||||
Build-Depends: convertible
|
Build-Depends: convertible
|
||||||
, Cabal >= 1.10 && < 1.17
|
, Cabal >= 1.10 && < 1.17
|
||||||
else
|
if impl(ghc < 7.6)
|
||||||
Build-Depends: Cabal >= 1.18
|
|
||||||
if impl(ghc < 7.6.0)
|
|
||||||
Build-Depends: executable-path
|
Build-Depends: executable-path
|
||||||
CPP-Options: -DSPEC=1
|
CPP-Options: -DSPEC=1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user