diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-05-26 14:18:05 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-05-26 14:18:05 +0000 |
| commit | d334c1e9568c9f50a5851d868a40fe8a736d4ddc (patch) | |
| tree | 948d6946cc2928afc831923461a19378198ecf5e | |
| parent | 027d6ac4c5351d01f5d5ed7610b36ae621acad67 (diff) | |
| download | upstream-d334c1e9568c9f50a5851d868a40fe8a736d4ddc.tar.gz upstream-d334c1e9568c9f50a5851d868a40fe8a736d4ddc.tar.bz2 upstream-d334c1e9568c9f50a5851d868a40fe8a736d4ddc.zip | |
stop build when an error occurs and when BUILDLOG is set (#5160)
SVN-Revision: 16079
| -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 1e669443be..26a8626524 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 $(TOPDIR)/logs/$(1)/$(bd)) - +$$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(TOPDIR)/logs/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) + +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(TOPDIR)/logs/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets |