From 56239e49a601dcde6ace3fd869602e78b860ddf7 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Fri, 15 Oct 2004 08:26:30 +0000
Subject: Build the uClibc utils with the uClibc-targeted toolchain. While the
 host utils are also built, they are not currently installed.

---
 Makefile                   |  2 +-
 toolchain/uClibc/uclibc.mk | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 44220cc97..4891adfbf 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 # along with the packages to build for the target.
 #
 ##############################################################
-TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc
+TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils
 include toolchain/Makefile.in
 include toolchain/*/Makefile.in
 include package/Makefile.in
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 5b19c2c49..65f59f610 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -99,12 +99,11 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
 		install_dev
-	$(MAKE) -C $(UCLIBC_DIR) \
+	# Build the host utils.  Need to add an install target...
+	$(MAKE) -C $(UCLIBC_DIR)/utils \
 		PREFIX=$(STAGING_DIR) \
 		HOSTCC="$(HOSTCC)" \
-		utils install_utils
-	# Clean up the host compiled utils...
-	$(MAKE) -C $(UCLIBC_DIR)/utils clean
+		hostutils
 
 ifneq ($(TARGET_DIR),)
 $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
@@ -114,11 +113,11 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
 		RUNTIME_PREFIX=/ \
 		install_runtime
 
-$(TARGET_DIR)/usr/bin/ldd: $(TARGET_DIR)/lib/libc.so.0
+$(TARGET_DIR)/usr/bin/ldd: gcc
 	$(MAKE) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
 		PREFIX=$(TARGET_DIR) utils install_utils
 
-UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 $(TARGET_DIR)/usr/bin/ldd
+UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0
 endif
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
@@ -137,8 +136,7 @@ uclibc-clean:
 uclibc-dirclean:
 	rm -rf $(UCLIBC_DIR)
 
-
-
+uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
 
 #############################################################
 #
@@ -154,8 +152,7 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
 		RUNTIME_PREFIX=/ \
 		install_dev
 
-uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a
-
+uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd
 uclibc_target-clean:
 	rm -f $(TARGET_DIR)/include
 
-- 
cgit v1.2.3