Fixes to "make clean" for the iserv dir

ghc.mk

@@ -670,7 +670,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
 

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