diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2017-09-29 23:33:29 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-09-30 09:30:09 -0400 |
| commit | c15c4272018f22c9576e11342464d86782934e54 (patch) | |
| tree | 67e414d6514897bfb7c3c64c8eb8cc6bb48dc3cb | |
| parent | effcd565b6be4f945d3913d561bba515381405ed (diff) | |
| download | haskell-c15c4272018f22c9576e11342464d86782934e54.tar.gz | |
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
| -rw-r--r-- | iserv/ghc.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/iserv/ghc.mk b/iserv/ghc.mk index ff8b1531d8..c5ca6a524e 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 |