From 4b0d5a80f8b38bf9a264584ffc90b901f82c8cbb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 26 Sep 2007 21:12:38 +0000 Subject: - revert some bad checkins, fixup bad settings in atmel targets and move the gcc target abi back to a place where the other arch-specific settings live --- toolchain/uClibc/uclibc.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'toolchain/uClibc') diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 5a3e54845..0bb5f5b03 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -4,7 +4,7 @@ # ############################################################# -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +ifeq ($(BR2_TOOLCHAIN_SOURCE),y) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. @@ -34,14 +34,13 @@ UCLIBC_VER:=0.9.28 endif UCLIBC_SITE:=http://www.uclibc.org/downloads -ifeq ($(BR2_TOOLCHAIN_NORMAL),) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y) UCLIBC_SITE:=$(VENDOR_SITE) endif UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE) - -ifeq ($(BR2_TOOLCHAIN_NORMAL),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) UCLIBC_PATCH_DIR:=toolchain/uClibc/ else UCLIBC_PATCH_DIR:=$(VENDOR_PATCH_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION) -- cgit v1.2.3