From 783d430642d213761f32844088d29686b753ad6a Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Mon, 27 Dec 2010 11:51:49 +0100 Subject: Toolchain/Build system: rework commit da4852176b on cflags This patch removes use of cflags introduced by commit:da4852176b , as it will break cross compilation of some broken packages. However it leaves it in C libraries configuration/build as done previously. Signed-off-by: Abdoulaye Walsimou Gaye --- mk/uclibc.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mk/uclibc.mk') diff --git a/mk/uclibc.mk b/mk/uclibc.mk index dbb8572..289c030 100755 --- a/mk/uclibc.mk +++ b/mk/uclibc.mk @@ -32,6 +32,10 @@ UCLIBC_GIT_REVISION := $(subst ",,$(strip $(CONFIG_EMBTK_UCLIBC_GIT_REVISION))) UCLIBC_PACKAGE := uClibc-$(UCLIBC_VERSION).tar.bz2 UCLIBC_BUILD_DIR := $(TOOLS_BUILD)/uClibc-$(UCLIBC_VERSION) +EMBTK_UCLIBC_CFLAGS := $(TARGET_CFLAGS) $(EMBTK_TARGET_MCPU) +EMBTK_UCLIBC_CFLAGS += $(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS) +EMBTK_UCLIBC_CFLAGS += $(EMBTK_TARGET_MARCH) -pipe + uclibc_install: $(UCLIBC_BUILD_DIR)/.installed $(UCLIBC_BUILD_DIR)/.installed: uclibc_download \ @@ -45,14 +49,14 @@ $(UCLIBC_BUILD_DIR)/.installed: uclibc_download \ MULTILIB_DIR="/$(LIBDIR)/" \ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" \ KERNEL_HEADERS="$(SYSROOT)/usr/include/" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) -pipe" install_headers + UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install_headers $(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/ \ CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-" \ SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/" \ MULTILIB_DIR="/$(LIBDIR)/" \ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" \ KERNEL_HEADERS="$(SYSROOT)/usr/include/" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS) -pipe" install + UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install uclibc_download: $(call EMBTK_GENERIC_MESSAGE,"downloading uClibc-$(UCLIBC_VERSION) \ -- cgit v1.2.3