diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-09-08 19:55:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-09-08 19:55:42 +0000 |
commit | a9d683ca912b2c4837b2e65909c09ca01babe3df (patch) | |
tree | 6cbca6e13dd0bb18c9d9f1d4baa9a0ea7801b959 /rules.mk | |
parent | 4a2e4920b1d909ca254853b0dce46af3123e8f74 (diff) | |
download | upstream-a9d683ca912b2c4837b2e65909c09ca01babe3df.tar.gz upstream-a9d683ca912b2c4837b2e65909c09ca01babe3df.tar.bz2 upstream-a9d683ca912b2c4837b2e65909c09ca01babe3df.zip |
major target cleanup. it is now possible to have subtargets that can override many target settings, including arch - merge adm5120, adm5120eb. target profiles still need to be adapted for subtargets
SVN-Revision: 8694
Diffstat (limited to 'rules.mk')
-rw-r--r-- | rules.mk | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -5,6 +5,9 @@ # See /LICENSE for more information. # +ifneq ($(__rules_inc),1) +__rules_inc=1 + ifeq ($(DUMP),) -include $(TOPDIR)/.config endif @@ -13,8 +16,6 @@ include $(TOPDIR)/include/verbose.mk TMP_DIR:=$(TOPDIR)/tmp -include $(TOPDIR)/include/target.mk - export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- define qstrip @@ -23,6 +24,7 @@ endef #")) ARCH:=$(call qstrip,$(CONFIG_ARCH)) +BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD)) TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION)) BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX)) GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) @@ -37,7 +39,7 @@ SCRIPT_DIR:=$(TOPDIR)/scripts BUILD_DIR_BASE:=$(TOPDIR)/build_dir BUILD_DIR:=$(BUILD_DIR_BASE)/$(ARCH)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) BUILD_DIR_HOST:=$(BUILD_DIR_BASE)/host -BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH) +BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)_gcc$(GCCV) STAGING_DIR:=$(TOPDIR)/staging_dir/$(ARCH) STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc$(GCCV) @@ -133,3 +135,5 @@ endef all: FORCE: ; .PHONY: FORCE + +endif #__rules_inc |