summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-11-11 11:24:35 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-11-11 11:24:35 +0100
commit992d015f29faada82129141c35381e753ef00dee (patch)
treede6393702d55874978ab51dd5db924bb758baa85
parentc1cff8c0615a936b237c45e07f76e97351afe877 (diff)
downloadembtoolkit-992d015f29faada82129141c35381e753ef00dee.tar.gz
embtoolkit-992d015f29faada82129141c35381e753ef00dee.tar.bz2
embtoolkit-992d015f29faada82129141c35381e753ef00dee.tar.xz
Build system: toolchain: simplify selecttion of default compiler
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/toolchain.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index cd0487f..237ef3a 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -30,13 +30,12 @@ TARGETCLANGXX := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-clang++
#
# Default compilers to use for packages.
#
-__TARGETCC-$(CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN) := $(TARGETGCC)
-__TARGETCC-$(CONFIG_EMBTK_GCC_DEFAULT_TOOLCHAIN) := $(TARGETGCC)
-__TARGETCXX-$(CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN) := $(TARGETGCXX)
-__TARGETCXX-$(CONFIG_EMBTK_GCC_DEFAULT_TOOLCHAIN) := $(TARGETGCXX)
+__TARGETCC-y := $(TARGETGCC)
+__TARGETCXX-y := $(TARGETGCXX)
+
+__TARGETCC-$(__embtk_toolchain_use_llvm-y) := $(TARGETCLANG)
+__TARGETCXX-$(__embtk_toolchain_use_llvm-y) := $(TARGETCLANGXX)
-__TARGETCC-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETCLANG)
-__TARGETCC-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := $(TARGETCLANG)
#
# FIXME: remove this when clang++ will support exceptions in c++ for arm,
# as exceptions seem to work for mips.