X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2FMakefile;h=161b139d74a399dccee22db6ef85b18869742fe9;hp=7762593ef6a4d89f7807378fe9aa1fa1a4d628db;hb=c9bc7c504c61a0d935573c86657222b067037193;hpb=a3edea1b9136b05edfed95b58ba33a9ff46b6587 diff --git a/toolchain/Makefile b/toolchain/Makefile index 7762593ef6..161b139d74 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -28,13 +28,13 @@ curdir:=toolchain # subdirectories to descend into -$(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc $(LIBC) $(if $(CONFIG_GLIBC_PORTS),glibc-ports)) +$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),,kernel-headers binutils gcc $(LIBC) $(if $(CONFIG_GLIBC_PORTS),glibc-ports)) $(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare) $(curdir)/builddirs-install:=$($(curdir)/builddirs-compile) # builddir dependencies -$(curdir)/$(LIBC)/prepare:=$(curdir)/kernel-headers/install -ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) + $(curdir)/$(LIBC)/prepare:=$(curdir)/kernel-headers/install $(curdir)/gcc/prepare:=$(curdir)/binutils/install $(curdir)/kernel-headers/install:=$(curdir)/gcc/prepare $(curdir)/gcc/compile:=$(curdir)/$(LIBC)/prepare @@ -66,6 +66,6 @@ $(curdir)//install = $(1)/compile $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed: -$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed)) +$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR))) $(eval $(call subdir,$(curdir)))