diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
| commit | 6352799ccb7d7b9c7d006fd1149b1a977f78e9b3 (patch) | |
| tree | b4db91f52d0c0777be3ff92ca1beb3b8c0bab91c /gf.cabal | |
| parent | b1611eccd82fa28d3a701a87291dc8d83537071e (diff) | |
| parent | a45c735545052501e53ecccfa33d0c3e42cc25fd (diff) | |
Merge branch 'master' into new-website
# Conflicts:
# index.html
Diffstat (limited to 'gf.cabal')
| -rw-r--r-- | gf.cabal | 28 |
1 files changed, 10 insertions, 18 deletions
@@ -1,5 +1,5 @@ name: gf -version: 3.9-git +version: 3.10 cabal-version: >= 1.22 build-type: Custom @@ -42,7 +42,7 @@ data-files: custom-setup setup-depends: base, - Cabal >=1.4.0.0, + Cabal >=1.22.0.0, directory, filepath, process >=1.0.1.1 @@ -67,11 +67,6 @@ flag network-uri -- Description: Make -new-comp the default -- Default: True -flag custom-binary - Description: Use a customised version of the binary package - Default: True - Manual: True - flag c-runtime Description: Include functionality from the C run-time library (which must be installed already) Default: False @@ -89,17 +84,14 @@ Library exceptions hs-source-dirs: src/runtime/haskell - if flag(custom-binary) - other-modules: - -- not really part of GF but I have changed the original binary library - -- and we have to keep the copy for now. - Data.Binary - Data.Binary.Put - Data.Binary.Get - Data.Binary.Builder - Data.Binary.IEEE754 - else - build-depends: binary, data-binary-ieee754 + other-modules: + -- not really part of GF but I have changed the original binary library + -- and we have to keep the copy for now. + Data.Binary + Data.Binary.Put + Data.Binary.Get + Data.Binary.Builder + Data.Binary.IEEE754 --ghc-options: -fwarn-unused-imports --if impl(ghc>=7.8) |