Fix some dependencies

ghc.mk

@@ -474,6 +474,8 @@ utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
 utils/ghc-pwd/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk
 
+utils/ghctags/dist-install/package-data.mk: compiler/stage2/package-data.mk
+utils/hpc/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/compare_sizes/dist-install/package-data.mk: compiler/stage2/package-data.mk

utils/ghctags/ghctags.cabal

@@ -16,5 +16,7 @@ Executable ghctags
     Main-Is: Main.hs
 
     Build-Depends: base       >= 4   && < 5,
+                   containers,
+                   Cabal,
                    ghc
 

utils/hpc/hpc-bin.cabal

@@ -43,6 +43,6 @@ Executable hpc
         Build-Depends: directory  >= 1   && < 1.3,
                        containers >= 0.1 && < 0.6,
                        array      >= 0.1 && < 0.5
-    Build-Depends: haskell98, hpc
+    Build-Depends: hpc
     Extensions: CPP