[commit: ghc] master: iserv: Don't build vanilla iserv unless vanilla libraries are built (c15c427)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c15c4272018f22c9576e11342464d86782934e54/ghc

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

commit c15c4272018f22c9576e11342464d86782934e54
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Sep 29 23:33:29 2017 -0400

    iserv: Don't build vanilla iserv unless vanilla libraries are built
    
    Test Plan: Validate
    
    Reviewers: austin, snowleopard
    
    Subscribers: angerman, rwbarton, thomie, int-e
    
    Differential Revision: https://phabricator.haskell.org/D4042


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

c15c4272018f22c9576e11342464d86782934e54
 iserv/ghc.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/iserv/ghc.mk b/iserv/ghc.mk
index ff8b153..c5ca6a5 100644
--- a/iserv/ghc.mk
+++ b/iserv/ghc.mk
@@ -69,15 +69,20 @@ iserv_stage2_INSTALL_INPLACE = YES
 iserv_stage2_p_INSTALL_INPLACE = YES
 iserv_stage2_dyn_INSTALL_INPLACE = YES
 
-$(eval $(call build-prog,iserv,stage2,1))
-
 ifeq "$(CLEANING)" "YES"
 
+NEED_iserv = YES
 NEED_iserv_p = YES
 NEED_iserv_dyn = YES
 
 else
 
+ifneq "$(findstring v, $(GhcLibWays))" ""
+NEED_iserv = YES
+else
+NEED_iserv = NO
+endif
+
 ifneq "$(findstring p, $(GhcLibWays))" ""
 NEED_iserv_p = YES
 else
@@ -91,6 +96,10 @@ NEED_iserv_dyn = NO
 endif
 endif
 
+ifeq "$(NEED_iserv)" "YES"
+$(eval $(call build-prog,iserv,stage2,1))
+endif
+
 ifeq "$(NEED_iserv_p)" "YES"
 $(eval $(call build-prog,iserv,stage2_p,1))
 endif