aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-12 12:37:51 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-12 12:37:51 +0000
commit524991c7c302fb78b915ca1fe56af8cb781a4fc3 (patch)
treea8f6149de99e463b09527c633c83b07a6cc45931 /toolchain
parent7f056e9e212d4124869200f1621ff4cc4479588a (diff)
downloadbuildroot-524991c7c302fb78b915ca1fe56af8cb781a4fc3.tar.gz
buildroot-524991c7c302fb78b915ca1fe56af8cb781a4fc3.tar.bz2
Whitespace cleanup of uclibc, remove debug aid
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/uclibc.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d8ca8353fa..9b3fba884f 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -34,14 +34,14 @@ UCLIBC_VER:=0.9.28
endif
UCLIBC_SITE:=http://www.uclibc.org/downloads
-ifeq ($(BR2_TOOLCHAIN_NORMAL),)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),)
UCLIBC_SITE:=$(VENDOR_SITE)
endif
UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE)
-ifeq ($(BR2_TOOLCHAIN_NORMAL),y)
+ifeq ($(BR2_TOOLCHAIN_NORMAL),y)
UCLIBC_PATCH_DIR:=toolchain/uClibc/
else
UCLIBC_PATCH_DIR:=$(VENDOR_PATCH_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION)
@@ -53,7 +53,8 @@ endif
UCLIBC_CAT:=$(BZCAT)
-UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed -e s'/-.*//' \
+UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
+ -e 's/-.*//' \
-e 's/i.86/i386/' \
-e 's/sparc.*/sparc/' \
-e 's/arm.*/arm/g' \
@@ -140,6 +141,11 @@ ifeq ($(BR2_ARM_OABI),y)
/bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.config
/bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.config
endif
+ifeq ($(BR2_generic_arm),y)
+ $(SED) 's,^.*CONFIG_GENERIC_ARM.*,CONFIG_GENERIC_ARM=y,g' $(UCLIBC_DIR)/.config
+else
+ $(SED) 's,^.*CONFIG_GENERIC_ARM.*,# CONFIG_GENERIC_ARM is not set,g' $(UCLIBC_DIR)/.config
+endif
endif
ifneq ($(UCLIBC_TARGET_ENDIAN),)
# The above doesn't work for me, so redo
@@ -261,9 +267,6 @@ endif
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
- touch $@
-
-$(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.config
$(MAKE1) -C $(UCLIBC_DIR) \
PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
@@ -272,7 +275,7 @@ $(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.config
oldconfig
touch $@
-$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.oldconfig
+$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config
set -x && $(MAKE1) -C $(UCLIBC_DIR) \
PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
@@ -388,8 +391,6 @@ uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
uclibc-config: $(UCLIBC_DIR)/.config
-uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
-
uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
uclibc-configured-source: uclibc-source