From 1b280db8e42136a48594ca00cc5c6d4b69341feb Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 26 Aug 2009 11:59:11 +0200
Subject: [PATCH] pass ARCH down to uClibc

Signed-off-by: aldot <rep.dot.nop@gmail.com>
---
 toolchain/uClibc/uclibc.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index fe32004..32f1a6b 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -452,6 +452,7 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 		$(TOOL_BUILD_DIR)/uClibc_dev/usr/lib \
 		$(TOOL_BUILD_DIR)/uClibc_dev/lib
 	$(MAKE1) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -476,6 +477,7 @@ ifeq ($(findstring y,$(BR2_UCLIBC_VERSION_0_9_27)$(BR2_UCLIBC_VERSION_0_9_28_3)$
 		pregen install_dev
 else
 	set -x && $(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -508,6 +510,7 @@ endif
 
 $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_initial) $(LIBFLOAT_TARGET)
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX= \
 		DEVEL_PREFIX=/ \
 		RUNTIME_PREFIX=/ \
@@ -520,6 +523,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_initial) $(LIBFLOAT_TA
 
 uclibc-menuconfig libc-menuconfig: host-sed $(UCLIBC_DIR)/.config
 	$(MAKE1) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -556,12 +560,14 @@ endif
 $(STAGING_DIR)/usr/lib/libc.a: | $(UCLIBC_DIR)/lib/libc.a
 ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX= \
 		DEVEL_PREFIX=$(STAGING_DIR)/ \
 		RUNTIME_PREFIX=$(STAGING_DIR)/ \
 		install_runtime install_dev
 else
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
@@ -593,6 +599,7 @@ endif
 	# Build the host utils. Need to add an install target...
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 	$(MAKE) -C $(UCLIBC_DIR)/ \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
@@ -601,6 +608,7 @@ ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 	touch -c $@
 else
 	$(MAKE1) -C $(UCLIBC_DIR)/utils \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(STAGING_DIR) \
 		HOSTCC="$(HOSTCC)" \
 		hostutils
@@ -635,6 +643,7 @@ endif
 ifneq ($(TARGET_DIR),)
 $(TARGET_DIR)/lib/libc.so.0: | $(STAGING_DIR)/usr/lib/libc.a
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
@@ -645,6 +654,7 @@ $(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
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
@@ -677,7 +687,7 @@ libc-configured: kernel-headers $(UCLIBC_DIR)/.configured
 libc-configured-source: libc-source
 
 uclibc-clean libc-clean:
-	-$(MAKE1) -C $(UCLIBC_DIR) clean
+	-$(MAKE1) -C $(UCLIBC_DIR) ARCH=$(UCLIBC_TARGET_ARCH) clean
 	$(patsubst %,rm -f %, $(wildcard $(STAGING_DIR)/usr/bin/*readelf \
 		$(STAGING_DIR)/usr/bin/*ldd \
 		$(STAGING_DIR)/usr/bin/*ldconfig \
@@ -715,6 +725,7 @@ uclibc-target-utils-source libc-target-utils-source: $(DL_DIR)/$(UCLIBC_SOURCE)
 
 $(TARGET_DIR)/usr/lib/libc.a: | $(STAGING_DIR)/usr/lib/libc.a
 	$(MAKE) -C $(UCLIBC_DIR) \
+		ARCH=$(UCLIBC_TARGET_ARCH) \
 		PREFIX=$(TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
-- 
2.11.4.GIT