[commit: ghc] wip/nfs-locking: Add builders: DeriveConstants, Nm, Objdump. (6001acb)

[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/6001acb394a70a14e333dd17a8f65b89115dfa52/ghc

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

commit 6001acb394a70a14e333dd17a8f65b89115dfa52
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 27 01:51:33 2015 +0000

    Add builders: DeriveConstants, Nm, Objdump.


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

6001acb394a70a14e333dd17a8f65b89115dfa52
 cfg/system.config.in | 45 ++++++++++++++++++++++++---------------------
 src/Builder.hs       |  6 ++++++
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/cfg/system.config.in b/cfg/system.config.in
index 12ddeed..a2cfef3 100644
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -4,36 +4,39 @@
 # Paths to builders:
 #===================
 
-system-ghc     = @WithGhc@
-ghc-stage1     = inplace/bin/ghc-stage1
-ghc-stage2     = inplace/bin/ghc-stage2
-ghc-stage3     = inplace/bin/ghc-stage3
+system-ghc       = @WithGhc@
+ghc-stage1       = inplace/bin/ghc-stage1
+ghc-stage2       = inplace/bin/ghc-stage2
+ghc-stage3       = inplace/bin/ghc-stage3
 
-system-gcc     = @CC_STAGE0@
-gcc            = @WhatGccIsCalled@
+system-gcc       = @CC_STAGE0@
+gcc              = @WhatGccIsCalled@
 
-system-ghc-pkg = @GhcPkgCmd@
-ghc-pkg        = inplace/bin/ghc-pkg
+system-ghc-pkg   = @GhcPkgCmd@
+ghc-pkg          = inplace/bin/ghc-pkg
 
-ghc-cabal      = inplace/bin/ghc-cabal
+ghc-cabal        = inplace/bin/ghc-cabal
 
-haddock        = inplace/bin/haddock
+haddock          = inplace/bin/haddock
 
-hsc2hs         = inplace/bin/hsc2hs
+hsc2hs           = inplace/bin/hsc2hs
 
-genprimopcode  = inplace/bin/genprimopcode
+genprimopcode    = inplace/bin/genprimopcode
+derive-constants = inplace/bin/deriveConstants
 
-hs-cpp         = @HaskellCPPCmd@
-hs-cpp-args    = @HaskellCPPArgs@
+hs-cpp           = @HaskellCPPCmd@
+hs-cpp-args      = @HaskellCPPArgs@
 
-unlit          = inplace/lib/unlit
-ghc-split      = inplace/lib/ghc-split
+unlit            = inplace/lib/unlit
+ghc-split        = inplace/lib/ghc-split
 
-ld             = @LdCmd@
-ar             = @ArCmd@
-alex           = @AlexCmd@
-happy          = @HappyCmd@
-hscolour       = @HSCOLOUR@
+alex             = @AlexCmd@
+ar               = @ArCmd@
+happy            = @HappyCmd@
+hscolour         = @HSCOLOUR@
+ld               = @LdCmd@
+nm               = @NmCmd@
+objdump          = @ObjdumpCmd@
 
 # Information about builders:
 #============================
diff --git a/src/Builder.hs b/src/Builder.hs
index 4d41d0a..b58d701 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -19,6 +19,7 @@ import Stage
 -- TODO: do we really need staged builders?
 data Builder = Alex
              | Ar
+             | DeriveConstants
              | Gcc Stage
              | GccM Stage
              | GenPrimopCode
@@ -35,6 +36,8 @@ data Builder = Alex
              | HsCpp
              | Hsc2Hs
              | Ld
+             | Nm
+             | Objdump
              | Unlit
              deriving (Show, Eq, Generic)
 
@@ -43,6 +46,7 @@ builderKey :: Builder -> String
 builderKey builder = case builder of
     Alex             -> "alex"
     Ar               -> "ar"
+    DeriveConstants  -> "derive-constants"
     Gcc Stage0       -> "system-gcc"
     Gcc _            -> "gcc"
     GccM stage       -> builderKey $ Gcc stage -- synonym for 'Gcc -MM'
@@ -64,6 +68,8 @@ builderKey builder = case builder of
     Hsc2Hs           -> "hsc2hs"
     HsCpp            -> "hs-cpp"
     Ld               -> "ld"
+    Nm               -> "nm"
+    Objdump          -> "objdump"
     Unlit            -> "unlit"
 
 -- TODO: Paths to some builders should be determined using defaultProgramPath