From c21b144d1b6e94ca52e55259cbbea243a36bcda7 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Sat, 4 Jul 2009 01:09:03 +0200
Subject: Toolchain: eglibc: move some configure options in arch Makefile

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 mk/eglibc.mk    | 11 ++---------
 mk/mips-arch.mk | 13 ++++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index c8dd635..30bfd53 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -34,13 +34,6 @@ EGLIBC_BUILD_DIR := $(TOOLS_BUILD)/eglibc
 #EGLIBC options
 include $(EMBTK_ROOT)/mk/eglibc-options-parse.mk
 
-#Hard or soft floating point
-ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y)
-EGLIBC_FLOAT_TYPE := --with-fp=no
-else
-EGLIBC_FLOAT_TYPE := --with-fp=yes
-endif
-
 eglibc-headers_install: $(EGLIBC_HEADERS_BUILD_DIR)/.installed
 eglibc_install: $(EGLIBC_BUILD_DIR)/.installed
 
@@ -88,7 +81,7 @@ endif
 $(EGLIBC_HEADERS_BUILD_DIR)/.configured:
 	$(call CONFIGURE_MESSAGE,eglibc-$(EGLIBC_VERSION))
 	cd $(EGLIBC_HEADERS_BUILD_DIR); BUILD_CC=$(HOSTCC_CACHED) \
-	CFLAGS="-Os -pipe $(EMBTK_TARGET_ABI)" \
+	CFLAGS="-Os -pipe $(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS)" \
 	CC=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc \
 	CXX=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-g++ \
 	AR=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ar \
@@ -110,7 +103,7 @@ $(EGLIBC_BUILD_DIR)/.installed: $(EGLIBC_BUILD_DIR)/.configured
 $(EGLIBC_BUILD_DIR)/.configured:
 	$(call CONFIGURE_MESSAGE,eglibc-$(EGLIBC_VERSION))
 	cd $(EGLIBC_BUILD_DIR); BUILD_CC=$(HOSTCC_CACHED) \
-	CFLAGS="-Os -pipe $(EMBTK_TARGET_ABI)" \
+	CFLAGS="-Os -pipe $(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS)" \
 	CC=$(TARGETCC_CACHED) \
 	CXX=$(TARGETCXX_CACHED) \
 	AR=$(TARGETAR) \
diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk
index b51dde8..06e48b9 100644
--- a/mk/mips-arch.mk
+++ b/mk/mips-arch.mk
@@ -1,4 +1,4 @@
-#########################################################################################
+################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
 #
@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#########################################################################################
+################################################################################
 #
 # \file         mips_arch.mk
 # \brief	mips_arch.mk of Embtoolkit
 # \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # \date         May 2009
-#########################################################################################
+################################################################################
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y)
 LINUX_ARCH := mips
@@ -150,5 +150,12 @@ else
 GCC_WITH_FLOAT := --with-float=hard
 endif
 
+#Hard or soft floating point
+ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y)
+EGLIBC_FLOAT_TYPE := --with-fp=no
+else
+EGLIBC_FLOAT_TYPE := --with-fp=yes
+endif
+
 endif
 
-- 
cgit v1.2.3