X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/267cc36546d4741ed2b1bf63f6cae18bbfa3b2e2..134ed9ab3b2c8ed9d3e471796ce18fb84e565e06:/rules.mk diff --git a/rules.mk b/rules.mk index a6188f4a6..8883cbe5d 100644 --- a/rules.mk +++ b/rules.mk @@ -5,13 +5,16 @@ # See /LICENSE for more information. # --include $(TOPDIR)/.config +ifeq ($(DUMP),) + -include $(TOPDIR)/.config +endif include $(TOPDIR)/include/verbose.mk export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) +BUILD_DIR_SUFFIX:=$(strip $(subst ",, $(CONFIG_BUILD_SUFFIX))) WGET:=$(strip $(subst ",, $(CONFIG_WGET))) #"))"))")) # fix vim's broken syntax highlighting @@ -28,7 +31,7 @@ STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH) BIN_DIR:=$(TOPDIR)/bin PACKAGE_DIR:=$(BIN_DIR)/packages IPKG_TARGET_DIR:=$(PACKAGE_DIR) -BUILD_DIR:=$(TOPDIR)/build_$(ARCH) +BUILD_DIR:=$(TOPDIR)/build_$(ARCH)$(BUILD_DIR_SUFFIX) TMP_DIR:=$(TOPDIR)/tmp STAMP_DIR:=$(BUILD_DIR)/stamp TARGET_DIR:=$(BUILD_DIR)/root @@ -83,7 +86,9 @@ TARGET_CONFIGURE_OPTS:= \ CXX=$(TARGET_CROSS)g++ \ RANLIB=$(TARGET_CROSS)ranlib \ STRIP=$(TARGET_CROSS)strip \ - OBJCOPY=$(TARGET_CROSS)objcopy + OBJCOPY=$(TARGET_CROSS)objcopy \ + OBJDUMP=$(TARGET_CROSS)objdump \ + SIZE=$(TARGET_CROSS)size # strip an entire directory RSTRIP:= \ @@ -130,8 +135,6 @@ $(call shvar,$(1))=$$(call $(1)) export $(call shvar,$(1)) endef - all: FORCE: ; .PHONY: FORCE -%: ;