From 07a0fae658c834055f26922bcfaeae971c84f8c8 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Thu, 13 Nov 2008 14:14:13 +0100
Subject: [PATCH] fix uclibc_target with devel headers

  It depends on HAVE_INCLUDES and doesn't care about enable shared..
---
 toolchain/uClibc/uclibc.mk | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 5b659ea..ba6681b 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -513,8 +513,8 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_initial) $(LIBFLOAT_TA
 		HOSTCC="$(HOSTCC)" \
 		BUILD_CFLAGS="$(HOST_CFLAGS)" \
 		BUILD_LDFLAGS="$(HOST_LDFLAGS)" \
-		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
+		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_LD_FLAGS)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CC_FLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
 		all
 
 uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config
@@ -561,8 +561,8 @@ else
 		HOSTCC="$(HOSTCC)" \
 		BUILD_CFLAGS="$(HOST_CFLAGS)" \
 		BUILD_LDFLAGS="$(HOST_LDFLAGS)" \
-		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
+		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_LD_FLAGS)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CC_FLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
 		install_runtime install_dev
 endif
 	# Install the kernel headers to the staging dir if necessary
@@ -626,12 +626,12 @@ $(TARGET_DIR)/lib/libc.so.0: | $(STAGING_DIR)/usr/lib/libc.a
 		install_runtime
 	touch -c $@
 
-$(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
-	$(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \
-		CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
-		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
-		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
-		PREFIX=$(TARGET_DIR) utils install_utils
+$(TARGET_DIR)/usr/bin/ldd: $(cross_compiler) $(TARGET_DIR)/lib/libc.so.0
+	$(MAKE1) -C $(UCLIBC_DIR) \
+		PREFIX=$(TARGET_DIR) \
+		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_LD_FLAGS)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CC_FLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
+		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
@@ -699,6 +699,8 @@ $(TARGET_DIR)/usr/lib/libc.a: | $(STAGING_DIR)/usr/lib/libc.a
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
+		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) $(__UCLIBC_EXTRA_TARGET_CFLAGS)" \
 		install_dev
 	# Install the kernel headers to the target dir if necessary
 ifeq ($(LINUX_HEADERS_IS_KERNEL),y)
@@ -725,11 +727,11 @@ UCLIBC_TARGETS+=$(TARGET_DIR)/lib/libc.so.0
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
 UCLIBC_TARGETS+=$(TARGET_DIR)/usr/bin/ldd
 endif
-else
+endif
+
 ifeq ($(BR2_HAVE_INCLUDES),y)
 UCLIBC_TARGETS+=$(TARGET_DIR)/usr/lib/libc.a
 endif
-endif
 
 uclibc_target: cross_compiler uclibc $(UCLIBC_TARGETS)
 uclibc_target-clean:
-- 
2.11.4.GIT