diff options
| author | ralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 16:30:04 +0000 |
|---|---|---|
| committer | ralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 16:30:04 +0000 |
| commit | 51def42732d7a60636c5cc32237609c7543b722b (patch) | |
| tree | 1f0359fb95cb6b91dae7deedf0573ae3a81cc55c | |
| parent | eb4a5e76e519ea5ed87faa6821bbf25a3494a456 (diff) | |
added BUILD_LOG_DIR variable, make clean will delete the ./logs dir
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16148 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/subdir.mk | 4 | ||||
| -rw-r--r-- | rules.mk | 1 |
3 files changed, 4 insertions, 3 deletions
@@ -49,8 +49,8 @@ $(BUILD_DIR)/.prepared: Makefile @touch $@ clean: FORCE - rm -rf $(BUILD_DIR) $(BIN_DIR) $(_SINGLE)$(SUBMAKE) target/linux/clean + rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) dirclean: clean rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) diff --git a/include/subdir.mk b/include/subdir.mk index 26a8626524..be8c308205 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -34,8 +34,8 @@ define subdir $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(btype)/$(target): $(1)/$(bd)/$(btype)/$(target))) ) $(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)) - +$(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 $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd)) + +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(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 $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets @@ -64,6 +64,7 @@ STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR)) TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD) DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD) +BUILD_LOG_DIR:=$(TOPDIR)/logs TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(PATH) TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH) |