[commit: ghc] wip/nfs-locking: genapply now has a Cabal build (c525470)

[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/c5254701040d51590fd9f26cbff566be49ee3d58/ghc

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

commit c5254701040d51590fd9f26cbff566be49ee3d58
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 03:13:51 2015 +0100

    genapply now has a Cabal build


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

c5254701040d51590fd9f26cbff566be49ee3d58
 src/Rules/Compile.hs |  5 -----
 src/Rules/Data.hs    | 26 +-------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/Rules/Compile.hs b/src/Rules/Compile.hs
index 9f718eb..6b81a47 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 -/- "GenApply.o" %> \obj -> do
-        let src = pkgPath pkg -/- "GenApply.hs"
-        need [src]
-        build $ fullTargetWithWay target (Ghc stage) vanilla [src] [obj]
-
     matchBuildResult buildPath "o-boot" ?> \obj -> do
         (src, deps) <- dependencies buildPath obj
         need $ src : deps
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index 2898257..363d804 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -1,7 +1,7 @@
 module Rules.Data (buildPackageData) where
 
 import Expression
-import GHC (genapply, genprimopcode, hp2ps)
+import GHC (genprimopcode, hp2ps)
 import Oracles
 import Predicates (registerPackage)
 import Rules.Actions
@@ -47,30 +47,6 @@ buildPackageData rs target @ (PartialTarget stage pkg) = do
 
             postProcessPackageData $ path -/- "package-data.mk"
 
-    -- TODO: Track dependency on this generated file
-    -- TODO: Use a cabal file instead of manual hacks?
-    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 ""
-            contents = unlines
-                [ "utils_genapply_dist-boot_MODULES = GenApply"
-                , "utils_genapply_dist-boot_PROGNAME = genapply"
-                , "utils_genapply_dist-boot_HS_SRC_DIRS = ."
-                , "utils_genapply_dist-boot_INSTALL_INPLACE = YES"
-                , "utils_genapply_dist-boot_HC_OPTS = " ++ hcOpts ]
-        writeFileChanged mk contents
-
-    priority 2.0 $
-        when (pkg == genprimopcode) $ path -/- "package-data.mk" %> \mk -> do
-        let contents = unlines
-                [ "utils_genprimopcode_dist-boot_MODULES = Lexer Main ParserM Parser Syntax"
-                , "utils_genprimopcode_dist-boot_PROGNAME = genprimopcode"
-                , "utils_genprimopcode_dist-boot_HS_SRC_DIRS = ."
-                , "utils_genprimopcode_dist-boot_INSTALL_INPLACE = YES"
-                , "utils_genprimopcode_dist-boot_HC_OPTS = -package array" ]
-        writeFileChanged mk contents
-
     -- TODO: PROGNAME was $(CrossCompilePrefix)hp2ps
     -- TODO: code duplication around ghcIncludeDirs
     -- TODO: now using DEP_EXTRA_LIBS instead of EXTRA_LIBRARIES