[commit: ghc] wip/nfs-locking: deriveConstants now has a Cabal file (c0f3b67)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/c0f3b6709468744f8192171b94ab08d2c1010959/ghc

>---------------------------------------------------------------

commit c0f3b6709468744f8192171b94ab08d2c1010959
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 02:19:26 2015 +0100

    deriveConstants now has a Cabal file
    
    Since 314395e00be10e6343840c215a4779aeec2542df


>---------------------------------------------------------------

c0f3b6709468744f8192171b94ab08d2c1010959
 src/Rules/Compile.hs |  5 -----
 src/Rules/Data.hs    | 12 +-----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Rules/Compile.hs b/src/Rules/Compile.hs
index 60123ef..9f718eb 100644
--- a/src/Rules/Compile.hs
+++ b/src/Rules/Compile.hs
@@ -28,11 +28,6 @@ compilePackage _ target @ (PartialTarget stage pkg) = do
             build $ fullTargetWithWay target (Ghc stage) way [src] [obj]
 
     -- TODO: get rid of these special cases
-    priority 2.0 $ buildPath -/- "DeriveConstants.o" %> \obj -> do
-        let src = pkgPath pkg -/- "DeriveConstants.hs"
-        need [src]
-        build $ fullTargetWithWay target (Ghc stage) vanilla [src] [obj]
-
     priority 2.0 $ buildPath -/- "GenApply.o" %> \obj -> do
         let src = pkgPath pkg -/- "GenApply.hs"
         need [src]
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index cba8b69..2898257 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -1,7 +1,7 @@
 module Rules.Data (buildPackageData) where
 
 import Expression
-import GHC (deriveConstants, genapply, genprimopcode, hp2ps)
+import GHC (genapply, genprimopcode, hp2ps)
 import Oracles
 import Predicates (registerPackage)
 import Rules.Actions
@@ -50,16 +50,6 @@ buildPackageData rs target @ (PartialTarget stage pkg) = do
     -- TODO: Track dependency on this generated file
     -- TODO: Use a cabal file instead of manual hacks?
     priority 2.0 $
-        when (pkg == deriveConstants) $ path -/- "package-data.mk" %> \mk -> do
-        let contents = unlines
-                [ "utils_deriveConstants_dist-boot_MODULES = DeriveConstants"
-                , "utils_deriveConstants_dist-boot_PROGNAME = deriveConstants"
-                , "utils_deriveConstants_dist-boot_HS_SRC_DIRS = ."
-                , "utils_deriveConstants_dist-boot_INSTALL_INPLACE = YES"
-                , "utils_deriveConstants_dist-boot_HC_OPTS = -package process -package containers" ]
-        writeFileChanged mk contents
-
-    priority 2.0 $
         when (pkg == genapply) $ path -/- "package-data.mk" %> \mk -> do
         ghcUnreg <- flag GhcUnregisterised
         let hcOpts = "-package pretty" ++ if ghcUnreg then " -DNO_REGS" else ""