[commit: ghc] wip/nfs-locking: Drop "ghs-split" builder (b214918)

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

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

commit b214918b34ab1ab5131457391dbdb4d023ea46e0
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sat Jan 9 21:16:20 2016 +0800

    Drop "ghs-split" builder


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

b214918b34ab1ab5131457391dbdb4d023ea46e0
 cfg/system.config.in             | 3 +--
 src/Builder.hs                   | 2 --
 src/Rules/Generators/ConfigHs.hs | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cfg/system.config.in b/cfg/system.config.in
index 6338e33..498f78c 100644
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -28,8 +28,7 @@ derive-constants = inplace/bin/deriveConstants
 hs-cpp           = @HaskellCPPCmd@
 hs-cpp-args      = @HaskellCPPArgs@
 
-unlit            = inplace/lib/unlit
-ghc-split        = inplace/lib/ghc-split
+unlit            = inplace/lib/bin/unlit
 
 alex             = @AlexCmd@
 ar               = @ArCmd@
diff --git a/src/Builder.hs b/src/Builder.hs
index 5450815..efc3216 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -32,7 +32,6 @@ data Builder = Alex
              | GhcCabalHsColour
              | GhcM Stage
              | GhcPkg Stage
-             | GhcSplit
              | Haddock
              | Happy
              | HsColour
@@ -75,7 +74,6 @@ builderKey builder = case builder of
     GhcCabalHsColour -> builderKey $ GhcCabal -- synonym for 'GhcCabal hscolour'
     GhcPkg Stage0    -> "system-ghc-pkg"
     GhcPkg _         -> "ghc-pkg"
-    GhcSplit         -> "ghc-split"
     Happy            -> "happy"
     Haddock          -> "haddock"
     HsColour         -> "hscolour"
diff --git a/src/Rules/Generators/ConfigHs.hs b/src/Rules/Generators/ConfigHs.hs
index 547670a..5cdfc3f 100644
--- a/src/Rules/Generators/ConfigHs.hs
+++ b/src/Rules/Generators/ConfigHs.hs
@@ -32,7 +32,7 @@ generateConfigHs = do
     cGhcEnableTablesNextToCode <- yesNo ghcEnableTablesNextToCode
     cLeadingUnderscore         <- yesNo $ flag LeadingUnderscore
     cGHC_UNLIT_PGM             <- fmap takeFileName $ getBuilderPath Unlit
-    cGHC_SPLIT_PGM             <- fmap takeBaseName $ getBuilderPath GhcSplit
+    let cGHC_SPLIT_PGM         = "ghc-split"
     cLibFFI                    <- lift useLibFFIForAdjustors
     rtsWays                    <- getRtsWays
     cGhcRtsWithLibdw           <- getFlag WithLibdw