From 2ba31ae766470aa561af675bdb1a988863e1d8f4 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Tue, 16 Dec 2008 15:01:42 +0100
Subject: [PATCH] adjust for newer install_{host,}utils

---
 toolchain/uClibc/uclibc.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index ba6681b..9361a05 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -584,6 +584,15 @@ else
 	fi
 endif
 	# Build the host utils. Need to add an install target...
+ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
+	$(MAKE1) -C $(UCLIBC_DIR)/ \
+		PREFIX=$(STAGING_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=/ \
+		HOSTCC="$(HOSTCC)" \
+		install_hostutils
+	touch -c $@
+else
 	$(MAKE1) -C $(UCLIBC_DIR)/utils \
 		PREFIX=$(STAGING_DIR) \
 		HOSTCC="$(HOSTCC)" \
@@ -613,6 +622,7 @@ ifeq ($(BR2__UCLIBC_UCLIBC_HAS_LOCALE),y)
 	fi
 endif
 	touch -c $@
+endif
 
 # extra paranoia
 ifneq ($(TARGET_DIR),)
@@ -629,9 +639,11 @@ $(TARGET_DIR)/lib/libc.so.0: | $(STAGING_DIR)/usr/lib/libc.a
 $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler) $(TARGET_DIR)/lib/libc.so.0
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		PREFIX=$(TARGET_DIR) \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=/ \
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_LD_FLAGS)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CC_FLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
-		utils install_utils
+		install_utils
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
 	$(INSTALL) -m0755 -D $(TARGET_DIR)/usr/bin/ldd \
 		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
-- 
2.11.4.GIT