diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Makefile.in | 4 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 12 | ||||
| -rw-r--r-- | toolchain/ccache/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/ccache/ccache.mk | 4 | ||||
| -rw-r--r-- | toolchain/elf2flt/elf2flt.mk | 4 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 14 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 12 | ||||
| -rw-r--r-- | toolchain/gdb/gdb.mk | 10 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers-new.makefile | 8 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 36 | 
11 files changed, 54 insertions, 54 deletions
| diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in index d312b5642..db1a87a0b 100644 --- a/toolchain/Makefile.in +++ b/toolchain/Makefile.in @@ -21,7 +21,7 @@ ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)  BR2_SYSROOT_PREFIX=# nothing, straight into /usr  BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/  BR2_SYSROOT_TARGET_DESTDIR=DESTDIR=$(TARGET_DIR)/ -BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ +BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/  BR2_CONFIGURE_STAGING_SYSROOT=--with-sysroot=$(STAGING_DIR)  BR2_CONFIGURE_BUILD_TOOLS=--with-build-time-tools=$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin  BR2_SYSROOT=--sysroot=$(STAGING_DIR)/ @@ -30,7 +30,7 @@ else  BR2_SYSROOT_PREFIX=$(STAGING_DIR)  BR2_SYSROOT_STAGING_DESTDIR=# nothing  BR2_SYSROOT_TARGET_DESTDIR=# nothing -BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ +BR2_CONFIGURE_DEVEL_SYSROOT=--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/  BR2_CONFIGURE_STAGING_SYSROOT=# nothing  BR2_CONFIGURE_BUILD_TOOLS=# nothing  BR2_SYSROOT=# nothing diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 0337ca4cb..8300420f7 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -32,8 +32,8 @@ BINUTILS_NO_MPFR:=y  endif  ifndef BINUTILS_NO_MPFR -BINUTILS_HOST_PREREQ:=$(TOOL_BUILD_DIR)/gmp/lib/libgmp$(HOST_LIBEXT) \ -	$(TOOL_BUILD_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) +BINUTILS_HOST_PREREQ:=$(TOOLCHAIN_DIR)/gmp/lib/libgmp$(HOST_LIBEXT) \ +	$(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT)  BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) \  	$(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) @@ -59,10 +59,10 @@ BINUTILS_PATCH_EXTRA:=$(call XTENSA_PATCH,binutils,$(BINUTILS_PATCH_DIR),. ..)  endif  BINUTILS_SOURCE:=binutils-$(BINUTILS_OFFICIAL_VERSION).tar.bz2 -BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION) +BINUTILS_DIR:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION)  BINUTILS_CAT:=$(BZCAT) -BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build +BINUTILS_DIR1:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION)-build  $(DL_DIR)/$(BINUTILS_SOURCE):  	mkdir -p $(DL_DIR) @@ -70,9 +70,9 @@ $(DL_DIR)/$(BINUTILS_SOURCE):  binutils-unpacked: $(BINUTILS_DIR)/.patched  $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) -	mkdir -p $(TOOL_BUILD_DIR) +	mkdir -p $(TOOLCHAIN_DIR)  	rm -rf $(BINUTILS_DIR) -	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	$(CONFIG_UPDATE) $(@D)  	touch $@ diff --git a/toolchain/ccache/Config.in b/toolchain/ccache/Config.in index 70856a7a9..6f36650c7 100644 --- a/toolchain/ccache/Config.in +++ b/toolchain/ccache/Config.in @@ -10,7 +10,7 @@ config BR2_CCACHE  config BR2_CCACHE_DIR  	string "ccache dir location?"  	depends on BR2_CCACHE -	default "$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache" +	default "$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"  	help  	    Where ccache should store cached files. diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index 723b8719f..43ed2a773 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -6,7 +6,7 @@  CCACHE_VER:=2.4  CCACHE_SITE:=http://samba.org/ftp/ccache  CCACHE_SOURCE:=ccache-$(CCACHE_VER).tar.gz -CCACHE_DIR1:=$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER) +CCACHE_DIR1:=$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)  CCACHE_DIR2:=$(BUILD_DIR)/ccache-$(CCACHE_VER)  CCACHE_CAT:=$(ZCAT)  CCACHE_BINARY:=ccache @@ -16,7 +16,7 @@ $(DL_DIR)/$(CCACHE_SOURCE):  	$(call DOWNLOAD,$(CCACHE_SITE),$(CCACHE_SOURCE))  $(CCACHE_DIR1)/.unpacked: $(DL_DIR)/$(CCACHE_SOURCE) -	$(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	$(CCACHE_CAT) $(DL_DIR)/$(CCACHE_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	touch $@  $(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk index f5a92b1f2..ac1bebdd5 100644 --- a/toolchain/elf2flt/elf2flt.mk +++ b/toolchain/elf2flt/elf2flt.mk @@ -6,11 +6,11 @@  # we keep a local checkout of uClinux CVS  ELF2FLT_SOURCE:=$(ELF2FLT_DIR)/elf2flt -ELF2FLT_DIR:=$(TOOL_BUILD_DIR)/elf2flt +ELF2FLT_DIR:=$(TOOLCHAIN_DIR)/elf2flt  ELF2FLT_BINARY:=elf2flt  $(ELF2FLT_DIR)/.unpacked: -	cp -r toolchain/elf2flt/elf2flt "$(TOOL_BUILD_DIR)/elf2flt" +	cp -r toolchain/elf2flt/elf2flt "$(TOOLCHAIN_DIR)/elf2flt"  	touch $@  $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index dde609bf0..1652aaf4d 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -40,7 +40,7 @@ GCC_PATCH_DIR:=toolchain/gcc/ext_source/$(VENDOR_PATCH_DIR)/$(GCC_OFFICIAL_VERSI  endif  GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 -GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER) +GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VER)  ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)  ifeq ($(GCC_SNAP_DATE),) @@ -111,7 +111,7 @@ GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)  ifeq ($(BR2_INSTALL_FORTRAN),y)  GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran  #GCC_TARGET_PREREQ += $(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libgmp.so -#GCC_STAGING_PREREQ+= $(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so +#GCC_STAGING_PREREQ+= $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so  GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)"  GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)"  endif @@ -130,7 +130,7 @@ HOST_SOURCE+=gcc-source  # build the first pass gcc compiler  #  ############################################################# -GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial +GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial  $(DL_DIR)/$(GCC_SOURCE):  	mkdir -p $(DL_DIR) @@ -138,8 +138,8 @@ $(DL_DIR)/$(GCC_SOURCE):  gcc-unpacked: $(GCC_DIR)/.patched  $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) -	mkdir -p $(TOOL_BUILD_DIR) -	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	mkdir -p $(TOOLCHAIN_DIR) +	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	$(CONFIG_UPDATE) $(@D)  	touch $@ @@ -176,7 +176,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched  		--host=$(GNU_HOST_NAME) \  		--target=$(REAL_GNU_TARGET_NAME) \  		--enable-languages=c \ -		--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		--with-sysroot=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		--disable-__cxa_atexit \  		--enable-target-optspace \  		--with-gnu-ld \ @@ -226,7 +226,7 @@ gcc_initial-dirclean:  # affect gcc-target. However, I haven't tested gcc-target yet so no  # guarantees. mjn3 -GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final +GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final  $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)  	mkdir -p $(GCC_BUILD_DIR2)  	# Important! Required for limits.h to be fixed. diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 412915274..98295e307 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -56,7 +56,7 @@ GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..)  endif  GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VERSION).tar.bz2 -GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VERSION) +GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VERSION)  GCC_CAT:=$(BZCAT)  GCC_STRIP_HOST_BINARIES:=nope  GCC_SRC_DIR:=$(GCC_DIR) @@ -125,7 +125,7 @@ GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR)  ifeq ($(BR2_INSTALL_FORTRAN),y)  GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran  #GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so -#GCC_STAGING_PREREQ+=$(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so +#GCC_STAGING_PREREQ+=$(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so  GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)"  GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)"  endif @@ -160,9 +160,9 @@ $(DL_DIR)/$(GCC_SOURCE):  gcc-unpacked: $(GCC_DIR)/.patched  $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) -	mkdir -p $(TOOL_BUILD_DIR) +	mkdir -p $(TOOLCHAIN_DIR)  	rm -rf $(GCC_DIR) -	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	$(CONFIG_UPDATE) $(@D)  	touch $@ @@ -196,7 +196,7 @@ endif  # build the first pass gcc compiler  #  ############################################################# -GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial +GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial  # The --without-headers option stopped working with gcc 3.0 and has never been @@ -274,7 +274,7 @@ gcc_initial-dirclean:  # affect gcc-target. However, I haven't tested gcc-target yet so no  # guarantees. mjn3 -GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final +GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final  $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)  	mkdir -p $(GCC_BUILD_DIR2)  	# Important! Required for limits.h to be fixed. diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 569f4496a..c51348f0b 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -23,19 +23,19 @@ include target/xtensa/patch.in  GDB_PATCH_EXTRA:=$(call XTENSA_PATCH,gdb,$(GDB_PATCH_DIR),. ..)  endif -GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_OFFICIAL_VERSION) +GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_OFFICIAL_VERSION)  $(DL_DIR)/$(GDB_SOURCE):  	$(call DOWNLOAD,$(GDB_SITE),$(GDB_SOURCE))  gdb-unpacked: $(GDB_DIR)/.unpacked  $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) -	mkdir -p $(TOOL_BUILD_DIR) -	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	mkdir -p $(TOOLCHAIN_DIR) +	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  ifeq ($(GDB_VERSION),snapshot)  	GDB_REAL_DIR=$(shell \  		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) -	ln -sf $(TOOL_BUILD_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR) +	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)  endif  	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)  	$(CONFIG_UPDATE) $(@D) @@ -174,7 +174,7 @@ gdbserver-dirclean:  #  ###################################################################### -GDB_HOST_DIR:=$(TOOL_BUILD_DIR)/gdbhost-$(GDB_VERSION) +GDB_HOST_DIR:=$(TOOLCHAIN_DIR)/gdbhost-$(GDB_VERSION)  $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked  	mkdir -p $(GDB_HOST_DIR) diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index 2074e4645..29deaae76 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -19,8 +19,8 @@ LINUX_HEADERS_VERSION:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)  LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/  LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2  LINUX_HEADERS_CAT:=$(BZCAT) -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-$(LINUX_HEADERS_VERSION) -LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux +LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION) +LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux  ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.26.8")  LINUX_RT_VERSION:=rt16 @@ -39,8 +39,8 @@ endif  $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)  	@echo "*** Using kernel-headers generated from kernel source"  	rm -rf $(LINUX_HEADERS_DIR) -	[ -d $(TOOL_BUILD_DIR) ] || $(INSTALL) -d $(TOOL_BUILD_DIR) -	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	[ -d $(TOOLCHAIN_DIR) ] || $(INSTALL) -d $(TOOLCHAIN_DIR) +	$(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	touch $@  $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 7897a4519..1f637f966 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -11,7 +11,7 @@ DEFAULT_KERNEL_HEADERS:=$(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))  LINUX_HEADERS_SITE:=127.0.0.1  LINUX_HEADERS_SOURCE:=unspecified-kernel-headers -LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-null +LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-libc-headers-null  KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \  	-e s/i.86/i386/ -e s/sun4u/sparc64/ \ diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 3a5e77075..292f89558 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -18,9 +18,9 @@ UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE)  ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)  UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots -UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc +UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc  else -UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION) +UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION)  UCLIBC_SITE:=http://www.uclibc.org/downloads  ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y)  UCLIBC_SITE:=$(VENDOR_SITE) @@ -94,9 +94,9 @@ endif  uclibc-unpacked: $(UCLIBC_DIR)/.unpacked  $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA) -	mkdir -p $(TOOL_BUILD_DIR) +	mkdir -p $(TOOLCHAIN_DIR)  	rm -rf $(UCLIBC_DIR) -	$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - +	$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -  	touch $@  uclibc-patched: $(UCLIBC_DIR)/.patched @@ -412,14 +412,14 @@ endif  $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig  	cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config -	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include -	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib -	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib +	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/include +	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/usr/lib +	mkdir -p $(TOOLCHAIN_DIR)/uClibc_dev/lib  	$(MAKE1) -C $(UCLIBC_DIR) \  		ARCH="$(UCLIBC_TARGET_ARCH)" \ -		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		DEVEL_PREFIX=/usr/ \ -		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		HOSTCC="$(HOSTCC)" \  		oldconfig  	touch $@ @@ -427,27 +427,27 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig  $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config  	set -x && $(MAKE1) -C $(UCLIBC_DIR) \  		ARCH="$(UCLIBC_TARGET_ARCH)" \ -		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		DEVEL_PREFIX=/usr/ \ -		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		HOSTCC="$(HOSTCC)" headers \  		$(if $(BR2_UCLIBC_VERSION_0_9_28_3),install_dev,install_headers)  	# Install the kernel headers to the first stage gcc include dir  	# if necessary  ifeq ($(LINUX_HEADERS_IS_KERNEL),y) -	if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \ +	if [ ! -f $(TOOLCHAIN_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \  		cp -pLR $(LINUX_HEADERS_DIR)/include/* \ -			$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ +			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \  	fi  else  	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \  		cp -pLR $(LINUX_HEADERS_DIR)/include/asm \ -			$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ +			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \  		cp -pLR $(LINUX_HEADERS_DIR)/include/linux \ -			$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ +			$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \  		if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \  			cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ -				$(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ +				$(TOOLCHAIN_DIR)/uClibc_dev/usr/include/; \  		fi; \  	fi  endif @@ -466,9 +466,9 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_initial) $(LIBFLOAT_TA  uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config  	$(MAKE1) -C $(UCLIBC_DIR) \  		ARCH="$(UCLIBC_TARGET_ARCH)" \ -		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		DEVEL_PREFIX=/usr/ \ -		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +		RUNTIME_PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \  		HOSTCC="$(HOSTCC)" \  		menuconfig && \  	touch -c $(UCLIBC_DIR)/.config | 
