Do not override CFLAGS in uClibc. Instead concatenate with the ARCH_CFLAGS. Also...

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 2616974f4d06808a26306d219cd9403551b00955..c8c23fc7bd0f7673e567ab33a1377a2190b68915 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -113,6 +113,8 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE)
                -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
                -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
                $(UCLIBC_DIR)/.config
+       $(SED) 's,^ARCH_CFLAGS=",ARCH_CFLAGS="$(TARGET_CFLAGS) ,g' \
+               $(UCLIBC_DIR)/.config
 ifeq ($(UCLIBC_TARGET_ARCH),arm)
        $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
                 $(UCLIBC_DIR)/.config
@@ -346,7 +348,8 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a
        touch -c $@
 
 $(TARGET_DIR)/usr/bin/ldd:
-       $(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
+       $(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \
+               CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
                PREFIX=$(TARGET_DIR) utils install_utils
 ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
        mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils