[commit: hadrian] master: Undo iserv changes (#507) (5edcca7)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/5edcca746578c798bed34c3bf84ede39fc91c265

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

commit 5edcca746578c798bed34c3bf84ede39fc91c265
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Feb 20 21:05:09 2018 +0000

    Undo iserv changes (#507)
    
    * Undo iserv changes
    
    See #504 and https://phabricator.haskell.org/D4377
    
    * Update comments


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

5edcca746578c798bed34c3bf84ede39fc91c265
 src/GHC.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/GHC.hs b/src/GHC.hs
index e14cdb6..2a87d68 100644
--- a/src/GHC.hs
+++ b/src/GHC.hs
@@ -75,7 +75,8 @@ hpc                 = hsLib  "hpc"
 hpcBin              = hsUtil "hpc-bin"         `setPath` "utils/hpc"
 integerGmp          = hsLib  "integer-gmp"
 integerSimple       = hsLib  "integer-simple"
-iservBin            = hsUtil "iserv"
+-- iservBin         = hsUtil "iserv" -- FIXME: See #507
+iservBin            = hsPrg  "iserv-bin"       `setPath` "iserv"
 iservLib            = hsLib  "libiserv"
 libffi              = cTop   "libffi"
 mtl                 = hsLib  "mtl"
@@ -193,7 +194,7 @@ stage1Packages = do
              , time
              , xhtml              ]
           ++ [ iservBin | not win ]
-          ++ [ iservLib | not win ]
+          -- ++ [ iservLib | not win ] -- FIXME: See #507
           ++ [ unix     | not win ]
           ++ [ win32    | win     ]