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 | 6bcd07afdd1ffcba5fe94f1291b4e4f0c764263e (patch) | |
| tree | 30cacdb892969714d2a079f391ba6786b7c36489 /rules.mk | |
| parent | 9647361f814667b536160d416666bd25ab4b82fa (diff) | |
| download | upstream-6bcd07afdd1ffcba5fe94f1291b4e4f0c764263e.tar.gz upstream-6bcd07afdd1ffcba5fe94f1291b4e4f0c764263e.tar.bz2 upstream-6bcd07afdd1ffcba5fe94f1291b4e4f0c764263e.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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8694 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 |