From 6bcd07afdd1ffcba5fe94f1291b4e4f0c764263e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 8 Sep 2007 19:55:42 +0000 Subject: 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 --- toolchain/Makefile | 4 +++- toolchain/gcc/Makefile | 2 +- toolchain/uClibc/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'toolchain') diff --git a/toolchain/Makefile b/toolchain/Makefile index 80bdf485df..cbc726ef01 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -39,6 +39,8 @@ $(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(curdir)//compile = $(1)/prepare $(curdir)//install = $(1)/compile -$(eval $(call stampfile,$(curdir),toolchain,install)) +$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed: + +$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed)) $(eval $(call subdir,$(curdir))) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 2c86524664..a326bb716f 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -33,7 +33,7 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) include $(INCLUDE_DIR)/host-build.mk -STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed +STAMP_BUILT:=$(STAGING_DIR)/stamp/.gcc-initial_installed BUILD_DIR1:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-initial BUILD_DIR2:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-final diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index d117cbd890..af2af48e06 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -22,8 +22,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) include $(INCLUDE_DIR)/host-build.mk -STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed -STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed +STAMP_BUILT:=$(STAGING_DIR)/stamp/.uclibc_installed +STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.uclibc-utils_installed UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -- cgit v1.2.3