diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-10-27 14:01:48 +0100 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-10-30 17:43:17 +0100 |
| commit | b05ab1a8bde53fee69d1ba99c7475444e9f84aa0 (patch) | |
| tree | 690f18bb81c01612eb1ae6b0ea23d641780979a5 /utils | |
| parent | 1f1c7c610b0ff26dccaef089e27003497fa25beb (diff) | |
| download | haskell-b05ab1a8bde53fee69d1ba99c7475444e9f84aa0.tar.gz | |
Build system: cleanup a few .cabal files
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghc-pwd/ghc-pwd.cabal | 2 | ||||
| -rw-r--r-- | utils/hpc/hpc-bin.cabal | 27 | ||||
| -rw-r--r-- | utils/runghc/runghc.cabal.in | 15 |
4 files changed, 13 insertions, 33 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 5827333bd4..1697f7cebc 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -13,7 +13,7 @@ cabal-version: >=1.10 Executable ghc-cabal Default-Language: Haskell2010 - Main-Is: ghc-cabal.hs + Main-Is: Main.hs Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, diff --git a/utils/ghc-pwd/ghc-pwd.cabal b/utils/ghc-pwd/ghc-pwd.cabal index 4d155b0317..dcd9529d3c 100644 --- a/utils/ghc-pwd/ghc-pwd.cabal +++ b/utils/ghc-pwd/ghc-pwd.cabal @@ -13,7 +13,7 @@ cabal-version: >=1.10 Executable ghc-pwd Default-Language: Haskell2010 - Main-Is: ghc-pwd.hs + Main-Is: Main.hs Build-Depends: base >= 3 && < 5, directory >= 1 && < 1.3 diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal index 0257fb99c7..87c5b11e5c 100644 --- a/utils/hpc/hpc-bin.cabal +++ b/utils/hpc/hpc-bin.cabal @@ -13,15 +13,9 @@ Category: Development build-type: Simple cabal-version: >=1.10 -Flag base4 - Description: Choose the even newer, even smaller, split-up base package. - -Flag base3 - Description: Choose the new smaller, split-up base package. - Executable hpc Default-Language: Haskell2010 - Main-Is: Hpc.hs + Main-Is: Main.hs Other-Modules: HpcParser HpcCombine HpcDraft @@ -34,17 +28,10 @@ Executable hpc HpcUtils Paths_hpc_bin - if flag(base4) - Build-Depends: base >= 4 && < 5 - if flag(base3) - Build-Depends: base >= 3 && < 4 - if !flag(base3) && !flag(base4) - Build-Depends: base < 3 - - if flag(base3) || flag(base4) - Build-Depends: directory >= 1 && < 1.3, - filepath >= 1 && < 1.5, - containers >= 0.1 && < 0.6, - array >= 0.1 && < 0.6 - Build-Depends: hpc + Build-Depends: base >= 4 && < 5, + directory >= 1 && < 1.3, + filepath >= 1 && < 1.5, + containers >= 0.1 && < 0.6, + array >= 0.1 && < 0.6, + hpc diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in index 6da179ad24..89f9e05c14 100644 --- a/utils/runghc/runghc.cabal.in +++ b/utils/runghc/runghc.cabal.in @@ -12,18 +12,11 @@ Category: Development build-type: Simple cabal-version: >=1.10 -Flag base3 - Description: Choose the new smaller, split-up base package. - Executable runghc Default-Language: Haskell2010 Main-Is: Main.hs - if flag(base3) - Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.3, - process >= 1 && < 1.3 - else - Build-Depends: base < 3 - Build-Depends: filepath - + Build-Depends: base >= 3 && < 5, + directory >= 1 && < 1.3, + process >= 1 && < 1.3, + filepath |