[commit: ghc] ghc-8.0: Fixes to "make clean" for the iserv dir (467f94f)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/467f94f47fcc863ee78d5c9e76ecdb4acbc13e05/ghc

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

commit 467f94f47fcc863ee78d5c9e76ecdb4acbc13e05
Author: Simon Marlow <smarlow at fb.com>
Date:   Mon Jan 18 06:41:19 2016 -0800

    Fixes to "make clean" for the iserv dir
    
    (cherry picked from commit 817dd925569d981523bbf4fb471014d46c51c7db)


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

467f94f47fcc863ee78d5c9e76ecdb4acbc13e05
 ghc.mk       |  2 +-
 iserv/ghc.mk | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index f521ceb..e095ffd 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -672,7 +672,7 @@ BUILD_DIRS += utils/mkUserGuidePart
 BUILD_DIRS += docs/users_guide
 BUILD_DIRS += utils/count_lines
 BUILD_DIRS += utils/compare_sizes
-ifeq "$(Windows_Host)" "NO"
+ifneq "$(Windows_Host)" "YES"
 BUILD_DIRS += iserv
 endif
 
diff --git a/iserv/ghc.mk b/iserv/ghc.mk
index 4cae482..1a44352 100644
--- a/iserv/ghc.mk
+++ b/iserv/ghc.mk
@@ -54,11 +54,31 @@ iserv_stage2_dyn_INSTALL_INPLACE = YES
 
 $(eval $(call build-prog,iserv,stage2,1))
 
+ifeq "$(CLEANING)" "YES"
+
+NEED_iserv_p = YES
+NEED_iserv_dyn = YES
+
+else
+
 ifneq "$(findstring p, $(GhcLibWays))" ""
-$(eval $(call build-prog,iserv,stage2_p,1))
+NEED_iserv_p = YES
+else
+NEED_iserv_p = NO
 endif
 
 ifneq "$(findstring dyn, $(GhcLibWays))" ""
+NEED_iserv_dyn = YES
+else
+NEED_iserv_dyn = NO
+endif
+endif
+
+ifeq "$(NEED_iserv_p)" "YES"
+$(eval $(call build-prog,iserv,stage2_p,1))
+endif
+
+ifeq "$(NEED_iserv_dyn)" "YES"
 $(eval $(call build-prog,iserv,stage2_dyn,1))
 endif