diff options
| author | Simon Marlow <smarlow@fb.com> | 2016-01-18 06:41:19 -0800 |
|---|---|---|
| committer | Simon Marlow <smarlow@fb.com> | 2016-01-18 06:43:54 -0800 |
| commit | 817dd925569d981523bbf4fb471014d46c51c7db (patch) | |
| tree | 7c3bd5e633832a7718894f3a00290d1e9fe73431 | |
| parent | 54128992b2ae8b18816e74fd02bc49833dda031e (diff) | |
| download | haskell-817dd925569d981523bbf4fb471014d46c51c7db.tar.gz | |
Fixes to "make clean" for the iserv dir
| -rw-r--r-- | ghc.mk | 2 | ||||
| -rw-r--r-- | iserv/ghc.mk | 22 |
2 files changed, 22 insertions, 2 deletions
@@ -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 diff --git a/iserv/ghc.mk b/iserv/ghc.mk index 4cae48299f..1a443525d3 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 |