summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2010-12-27 11:51:49 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2010-12-27 12:12:23 +0100
commit783d430642d213761f32844088d29686b753ad6a (patch)
tree8355b77ba77f1a479520d03080f23a25fe263266 /mk
parentce76cad6b9022013c73163f001b7138c0452822b (diff)
downloadembtoolkit-783d430642d213761f32844088d29686b753ad6a.tar.gz
embtoolkit-783d430642d213761f32844088d29686b753ad6a.tar.bz2
embtoolkit-783d430642d213761f32844088d29686b753ad6a.tar.xz
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 <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/eglibc.mk9
-rw-r--r--mk/toolchain.mk6
-rwxr-xr-xmk/uclibc.mk8
3 files changed, 13 insertions, 10 deletions
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index 0d3d35a..d3fc71e 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -33,6 +33,10 @@ EGLIBC_PACKAGE := eglibc-$(EGLIBC_VERSION).tar.bz2
EGLIBC_HEADERS_BUILD_DIR := $(TOOLS_BUILD)/eglibc-headers
EGLIBC_BUILD_DIR := $(TOOLS_BUILD)/eglibc
+EMBTK_EGLIBC_CFLAGS := $(TARGET_CFLAGS) $(EMBTK_TARGET_MCPU)
+EMBTK_EGLIBC_CFLAGS += $(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS)
+EMBTK_EGLIBC_CFLAGS += $(EMBTK_TARGET_MARCH) -pipe
+
#Hard or soft floating point in eglibc?
ifeq ($(CONFIG_EMBTK_SOFTFLOAT),y)
EGLIBC_FLOAT_TYPE := --with-fp=no
@@ -103,7 +107,7 @@ endif
$(EGLIBC_HEADERS_BUILD_DIR)/.configured:
$(call EMBTK_CONFIGURE_MSG,eglibc-$(EGLIBC_VERSION))
cd $(EGLIBC_HEADERS_BUILD_DIR); BUILD_CC=$(HOSTCC_CACHED) \
- CFLAGS="$(TARGET_CFLAGS) -pipe" \
+ CFLAGS="$(EMBTK_EGLIBC_CFLAGS)" \
CC=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc \
CXX=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-g++ \
AR=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ar \
@@ -126,8 +130,7 @@ $(EGLIBC_BUILD_DIR)/.installed: $(EGLIBC_BUILD_DIR)/.configured
$(EGLIBC_BUILD_DIR)/.configured:
$(call EMBTK_CONFIGURE_MSG,eglibc-$(EGLIBC_VERSION))
cd $(EGLIBC_BUILD_DIR); BUILD_CC=$(HOSTCC_CACHED) \
- CFLAGS="$(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS) \
- $(TARGET_CFLAGS) -pipe" \
+ CFLAGS="$(EMBTK_EGLIBC_CFLAGS)" \
CC=$(TARGETCC_CACHED) \
CXX=$(TARGETCXX_CACHED) \
AR=$(TARGETAR) \
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index a6a3783..1687bc8 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -32,11 +32,7 @@ TARGETNM := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-nm
TARGETSTRIP := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-strip
TARGETOBJDUMP := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-objdump
TARGETOBJCOPY := $(TOOLS)/bin/$(STRICT_GNU_TARGET)-objcopy
-TARGET_CFLAGS := $(EMBTK_TARGET_MCPU)
-TARGET_CFLAGS += $(EMBTK_TARGET_MARCH)
-TARGET_CFLAGS += $(EMBTK_TARGET_ABI)
-TARGET_CFLAGS += $(EMBTK_TARGET_FLOAT_CFLAGS)
-TARGET_CFLAGS += $(subst ",,$(strip $(CONFIG_EMBTK_TARGET_COMPILER_CFLAGS)))
+TARGET_CFLAGS := $(subst ",,$(strip $(CONFIG_EMBTK_TARGET_COMPILER_CFLAGS)))
TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_SIZE_OPTIMIZED),-Os,)
TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_SPEED_OPTIMIZED),-O3,)
TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_WITH_DEBUG_DATA),-g,)
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) \