Get everything building with base 4 in the HEAD

Some things were using the base3 compat library.

diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
index 8564fa4..2c1cd97 100644 (file)
--- a/utils/hpc/hpc-bin.cabal
+++ b/utils/hpc/hpc-bin.cabal
@@ -13,19 +13,29 @@ Category: Development
 build-type: Simple
 cabal-version: >=1.2
 
+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
     Main-Is: Hpc.hs
     Other-Modules: HpcParser
+
+    if flag(base4)
+        Build-Depends: base       >= 4   && < 5
     if flag(base3)
-        Build-Depends: base       >= 3   && < 4,
-                       directory  >= 1   && < 1.1,
+        Build-Depends: base       >= 3   && < 4
+    if !flag(base3) && !flag(base4)
+        Build-Depends: base       < 3
+
+    if flag(base4)
+        Build-Depends: getopt     >= 0.1 && < 0.2
+    if flag(base3) || flag(base4)
+        Build-Depends: directory  >= 1   && < 1.1,
                        containers >= 0.1 && < 0.2,
                        array      >= 0.1 && < 0.2
-    else
-        Build-Depends: base < 3
     Build-Depends: haskell98, hpc
     Extensions: CPP
 

diff --git a/utils/pwd/pwd.cabal b/utils/pwd/pwd.cabal
index 5422a73..cff48f8 100644 (file)
--- a/utils/pwd/pwd.cabal
+++ b/utils/pwd/pwd.cabal
@@ -17,7 +17,7 @@ Flag base3
 Executable pwd
     Main-Is: pwd.hs
     if flag(base3)
-        Build-Depends: base       >= 3   && < 4,
+        Build-Depends: base       >= 3   && < 5,
                        directory  >= 1   && < 1.1
     else
         Build-Depends: base < 3

diff --git a/utils/runghc/runghc.cabal b/utils/runghc/runghc.cabal
index c3620de..876e97d 100644 (file)
--- a/utils/runghc/runghc.cabal
+++ b/utils/runghc/runghc.cabal
@@ -20,7 +20,7 @@ Executable runghc
     Main-Is: runghc.hs
 
     if flag(base3)
-        Build-Depends: base       >= 3   && < 4,
+        Build-Depends: base       >= 3   && < 5,
                        directory  >= 1   && < 1.1,
                        process    >= 1   && < 1.1
     else