From 992d015f29faada82129141c35381e753ef00dee Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Mon, 11 Nov 2013 11:24:35 +0100 Subject: Build system: toolchain: simplify selecttion of default compiler Signed-off-by: Abdoulaye Walsimou Gaye --- mk/toolchain.mk | 11 +++++------ 1 file 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. -- cgit v1.2.3