From 5b0576ff0d03eec71534a6b0c7d39dea1a1a2c25 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Sun, 2 Nov 2014 13:56:59 +0100
Subject: Toolchain: fix gcc build error because of default fbracket-depth=256
 when it is compiled with clang

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 core/toolchain/gcc/common.mk |  8 ++++++++
 core/toolchain/gcc/gcc.mk    | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'core/toolchain')

diff --git a/core/toolchain/gcc/common.mk b/core/toolchain/gcc/common.mk
index 2ad450c..9bfc6a0 100644
--- a/core/toolchain/gcc/common.mk
+++ b/core/toolchain/gcc/common.mk
@@ -33,6 +33,14 @@ GCC_SRC_DIR	:= $(embtk_toolsb)/gcc-$(GCC_VERSION)
 GCC_MULTILIB	:= --disable-multilib
 GCC_DEPS	:= gmp_host_install mpfr_host_install mpc_host_install
 
+ifeq ($(embtk_hostcc_clang-y),y)
+GCC_CFLAGS	:= -g -O2 -fbracket-depth=1024
+GCC_CXXFLAGS	:= $(GCC_CFLAGS)
+endif
+
+GCC_MAKE_OPTS := CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)"
+GCC_MAKE_OPTS += CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)"
+
 pembtk_gcc_common_opts := --with-sysroot=$(embtk_sysroot)
 pembtk_gcc_common_opts += --target=$(STRICT_GNU_TARGET)
 pembtk_gcc_common_opts += $(GCC_WITH_ARCH)
diff --git a/core/toolchain/gcc/gcc.mk b/core/toolchain/gcc/gcc.mk
index 3fca324..045bd30 100644
--- a/core/toolchain/gcc/gcc.mk
+++ b/core/toolchain/gcc/gcc.mk
@@ -49,6 +49,13 @@ GCC1_CONFIGURE_OPTS	+= --disable-shared
 GCC1_CONFIGURE_OPTS	+= --disable-threads
 GCC1_CONFIGURE_OPTS	+= --disable-libatomic
 
+GCC1_CONFIGURE_ENV	:= $(GCC_CONFIGURE_ENV)
+
+GCC1_CFLAGS		:= $(GCC_CFLAGS)
+GCC1_CXXFLAGS		:= $(GCC_CXXFLAGS)
+
+GCC1_MAKE_OPTS		:= $(GCC_MAKE_OPTS)
+
 define embtk_install_gcc1
 	$(call embtk_makeinstall_hostpkg,gcc1,autotooled)
 endef
@@ -76,6 +83,13 @@ GCC2_CONFIGURE_OPTS	+= --disable-libatomic
 GCC2_CONFIGURE_OPTS	+= --disable-symvers
 GCC2_CONFIGURE_OPTS	+= $(GCC_CXA_ATEXIT-y)
 
+GCC2_CONFIGURE_ENV	:= $(GCC_CONFIGURE_ENV)
+
+GCC2_CFLAGS		:= $(GCC_CFLAGS)
+GCC2_CXXFLAGS		:= $(GCC_CXXFLAGS)
+
+GCC2_MAKE_OPTS		:= $(GCC_MAKE_OPTS)
+
 define embtk_install_gcc2
 	$(call embtk_makeinstall_hostpkg,gcc2,autotooled)
 endef
@@ -131,6 +145,13 @@ GCC3_CONFIGURE_OPTS	+= --enable-shared
 GCC3_CONFIGURE_OPTS	+= $(GCC_CXA_ATEXIT-y)
 GCC3_CONFIGURE_OPTS	+= $(GCC3_CONFIGURE_EXTRA_OPTIONS)
 
+GCC3_CONFIGURE_ENV	:= $(GCC_CONFIGURE_ENV)
+
+GCC3_CFLAGS		:= $(GCC_CFLAGS)
+GCC3_CXXFLAGS		:= $(GCC_CXXFLAGS)
+
+GCC3_MAKE_OPTS		:= $(GCC_MAKE_OPTS)
+
 define embtk_install_gcc3
 	$(call embtk_makeinstall_hostpkg,gcc3,autotooled)
 endef
-- 
cgit v1.2.3