diff options
| -rw-r--r-- | bridges/Module_bridges.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_SpeedUpTargets.mk | 43 |
2 files changed, 31 insertions, 14 deletions
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index f9d9c14f9321..b71e14277bf1 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ ) \ )) -ifeq (,$(gb_STRIPPED_BUILD)) +ifeq (,$(filter build,$(gb_Module_SKIPTARGETS))) ifeq ($(strip $(bridges_SELECTED_BRIDGE)),) $(call gb_Output_error,no bridge selected for build: bailing out) else ifneq ($(words $(bridges_SELECTED_BRIDGE)),1) diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 3db7218fdbd3..1e07a5f29cf3 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -30,36 +30,53 @@ gb_Module_add_targets_for_build := endif ifeq ($(gb_Side),build) -gb_Module_add_check_target := -gb_Module_add_slowcheck_target := -gb_Module_add_subsequentcheck_target := +gb_Module_SKIPTARGETS := check slowcheck subsequentcheck endif ifneq ($(strip $(MAKECMDGOALS)),) # speed up depending on the target -gb_SpeedUpTargets_LEVEL_3 := debugrun help translations -gb_SpeedUpTargets_LEVEL_2 := showmodules $(gb_SpeedUpTargets_LEVEL_3) +gb_SpeedUpTargets_LEVEL_4 := debugrun help translations +gb_SpeedUpTargets_LEVEL_3 := showmodules $(gb_SpeedUpTargets_LEVEL_4) +gb_SpeedUpTargets_LEVEL_2 := build $(gb_SpeedUpTargets_LEVEL_3) gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables $(gb_SpeedUpTargets_LEVEL_2) ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T)) gb_FULLDEPS := ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_2),$(MAKECMDGOALS)),,T)) -gb_Module_add_target := -gb_Module_add_check_target := -gb_Module_add_slowcheck_target := -gb_Module_add_subsequentcheck_target := - -# Turns of check in bridges/Module_bridges.mk: -gb_STRIPPED_BUILD := $(true) +gb_Module_SKIPTARGETS += check slowcheck subsequentcheck ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_3),$(MAKECMDGOALS)),,T)) -gb_Module_add_moduledir := +gb_Module_SKIPTARGETS += build + +ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_4),$(MAKECMDGOALS)),,T)) +gb_Module_SKIPTARGETS += module endif endif endif +endif endif + +ifneq (,$(filter build,$(gb_Module_SKIPTARGETS))) +gb_Module_add_target = +endif + +ifneq (,$(filter check,$(gb_Module_SKIPTARGETS))) +gb_Module_add_check_target = +endif + +ifneq (,$(filter slowcheck,$(gb_Module_SKIPTARGETS))) +gb_Module_add_slowcheck_target = +endif + +ifneq (,$(filter subsequentcheck,$(gb_Module_SKIPTARGETS))) +gb_Module_add_subsequentcheck_target = +endif + +ifneq (,$(filter module,$(gb_Module_SKIPTARGETS))) +gb_Module_add_moduledir = +endif # vim:set shiftwidth=4 softtabstop=4 noexpandtab: |