[commit: ghc] wip/nfs-locking: Build iservBin, fix comments (28f2675)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:43:53 UTC 2017


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

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

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

commit 28f26751efa6336fac0798eb2e07795eeeb134b2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Oct 29 11:15:33 2016 +0100

    Build iservBin, fix comments


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

28f26751efa6336fac0798eb2e07795eeeb134b2
 src/GHC.hs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index 6c1e147..c3242c6 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -95,6 +95,7 @@ ghcSplit = "inplace/lib/bin/ghc-split"
 stageDirectory :: Stage -> FilePath
 stageDirectory = stageString
 
+-- TODO: Create a separate rule for copying executables to inplace/bin
 -- TODO: move to buildRootPath, see #113
 -- | The 'FilePath' to a program executable in a given 'Context'.
 programPath :: Context -> Maybe FilePath
@@ -118,6 +119,7 @@ programPath Context {..} = lookup (stage, package) exes
            , inplace1 hpcBin          `setFile` "hpc"
            , inplace0 hsc2hs
            , install1 hsc2hs
+           , install1 iservBin
            , inplace0 mkUserGuidePart
            , inplace1 runGhc          `setFile` "runhaskell"
            , inplace0 touchy          `setDir`  "inplace/lib/bin"
@@ -132,10 +134,3 @@ programPath Context {..} = lookup (stage, package) exes
     install1 pkg = ((Stage1, pkg), install Stage1 pkg)
     setFile ((stage, pkg), x) y = ((stage, pkg), takeDirectory x -/- y <.> exe)
     setDir  ((stage, pkg), x) y = ((stage, pkg), y -/- takeFileName x)
-
-    -- | isProgram package = case stage of
-    --     Stage0 -> Just . inplaceProgram $ pkgNameString package
-    --     _      -> Just . installProgram $ pkgNameString package
-    -- | otherwise = Nothing
-  -- where
-  --   inplaceProgram name = programInplacePath -/- name <.> exe



More information about the ghc-commits mailing list