summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-03-16 10:50:18 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-03-16 10:50:18 +0100
commit027c0cdcc13a8c0e9f48c7f5dcc4cb818bf9977b (patch)
tree81b53c2f250c19dca6541ba08f5be13d2a8ae796 /toolchain
parentd1d2869fab1f8809f5d8a18ad862c2c76bdb4135 (diff)
downloadembtoolkit-027c0cdcc13a8c0e9f48c7f5dcc4cb818bf9977b.tar.gz
embtoolkit-027c0cdcc13a8c0e9f48c7f5dcc4cb818bf9977b.tar.bz2
embtoolkit-027c0cdcc13a8c0e9f48c7f5dcc4cb818bf9977b.tar.xz
Toolchain: fix rebuild if changed
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/toolchain.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
index 09fdb8f..63135ec 100644
--- a/toolchain/toolchain.mk
+++ b/toolchain/toolchain.mk
@@ -88,7 +88,9 @@ include mk/bmake.mk
# GNU make
include mk/gmake.mk
-# Toolchain internals
+#
+# Toolchain virtual package internals
+#
__xtools_compiler-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := clangllvm-$(LLVM_VERSION)
__xtools_compiler-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := clangllvm-$(LLVM_VERSION)
__xtools_compiler-$(CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN) := gcc-$(GCC_VERSION)
@@ -258,8 +260,8 @@ define __embtk_toolchain_addons_runrecipe-y
$(or $(call __embtk_pkg_runrecipe-y,toolchain_addons),$(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y))
endef
-__embtk_toolchain_buildargs := $(if $(strip $(__embtk_toolchain_runrecipe-y)),core-addons)
-__embtk_toolchain_buildargs +=$(if $(strip $(__embtk_toolchain_addons_runrecipe-y)),addons)
+__embtk_toolchain_buildargs = $(if $(strip $(__embtk_toolchain_runrecipe-y)),core-addons)
+__embtk_toolchain_buildargs += $(if $(strip $(__embtk_toolchain_addons_runrecipe-y)),addons)
toolchain_install:
$(Q)$(call __embtk_toolchain_build,$(__embtk_toolchain_buildargs))
@@ -283,3 +285,6 @@ TOOLCHAIN_ALL_DEPS := $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS)
TOOLCHAIN_ALL_DEPS += $(TOOLCHAIN_ADDONS_DEPS)
packages_fetch:: $(patsubst %_install,download_%,$(TOOLCHAIN_ALL_DEPS))
+
+-include $(call __embtk_pkg_dotkconfig_f,toolchain)
+-include $(call __embtk_pkg_dotkconfig_f,toolchain_addons)