diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-09-20 20:17:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-09-20 20:17:28 +0000 |
| commit | 7f80e266612c4ce1f17c7cbdfc268057de9ae58b (patch) | |
| tree | 8451e1acdff371f0bb9a4cd4c08c940745e618d9 /include/subdir.mk | |
| parent | affb66c2c61163f3a88f2ddaf346d660537e085a (diff) | |
| download | upstream-7f80e266612c4ce1f17c7cbdfc268057de9ae58b.tar.gz upstream-7f80e266612c4ce1f17c7cbdfc268057de9ae58b.tar.bz2 upstream-7f80e266612c4ce1f17c7cbdfc268057de9ae58b.zip | |
fix build dependencies on packages with multiple variants but no selected virtual packages
SVN-Revision: 23102
Diffstat (limited to 'include/subdir.mk')
| -rw-r--r-- | include/subdir.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index afc95a4427..19a1fb63a9 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -35,7 +35,7 @@ define subdir ) $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) $(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd)) - $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $($(1)/$(bd)/variants),$($(1)/$(bd)/variants),__default)), + $(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 $(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 $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) |