diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-03 03:40:09 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-03 03:40:09 +0000 |
| commit | 68373275cb029091cefb4368fd329678d3b3e275 (patch) | |
| tree | 1b77057d589fb2f22fd3ecdb85f4a5aa59f0a4b4 | |
| parent | 1ae73b4f488e605d02b6918d1c15e2c600beeae9 (diff) | |
build: reduce the amount of generated make code for the initial prereq scan - makes it about 20% faster
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26436 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/subdir.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index 72fec8944d..d079be118e 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -5,7 +5,12 @@ # See /LICENSE for more information. # -SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure +ifeq ($(MAKECMDGOALS),prereq) + SUBTARGETS:=prereq + PREREQ_ONLY:=1 +else + SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure +endif subtarget-default = $(filter-out ., \ $(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \ @@ -37,7 +42,7 @@ define subdir $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $(strip $($(1)/$(bd)/variants)),$($(1)/$(bd)/variants),$(if $($(1)/$(bd)/default-variant),$($(1)/$(bd)/default-variant),__default))), $(if $(call debug,$(1)/$(bd),v),,@)+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) BUILD_VARIANT="$(filter-out __default,$(variant))" $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build$(if $(filter-out __default,$(variant)), (build variant: $(variant))).)) ) - $(if $(DUMP_TARGET_DB),, + $(if $(PREREQ_ONLY)$(DUMP_TARGET_DB),, # legacy targets $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) # aliases |