summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-15 10:25:11 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-15 10:25:11 +0200
commit02845bf9c753b3490a807d788f8e168c34392759 (patch)
treea344faef774f97eb8d5d0c3d13c8339d8f08a556
parent5b06078d2df2810d0f9404452588ce285715855d (diff)
downloadembtoolkit-02845bf9c753b3490a807d788f8e168c34392759.tar.gz
embtoolkit-02845bf9c753b3490a807d788f8e168c34392759.tar.bz2
embtoolkit-02845bf9c753b3490a807d788f8e168c34392759.tar.xz
Toolchain internals: move __embtk_toolchain{,_addon}s_runrecipe-y to dedicated section
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/toolchain/toolchain.mk30
1 files changed, 15 insertions, 15 deletions
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk
index b987df6..9fdf391 100644
--- a/core/toolchain/toolchain.mk
+++ b/core/toolchain/toolchain.mk
@@ -25,7 +25,7 @@
embtk_pkgincdir := toolchain
#
-# Toolchain variables
+# Toolchain variables and macros
#
include core/toolchain/vars.mk
include packages/htools/ccache/vars.mk
@@ -34,6 +34,20 @@ include packages/htools/libtool/vars.mk
include packages/htools/autoconf/vars.mk
include packages/htools/automake/vars.mk
+__embtk_toolchain_runrecipe-y = $(strip $(___embtk_toolchain_runrecipe-y))
+define ___embtk_toolchain_runrecipe-y
+ $(eval __xtool_changed-y := $(call __embtk_pkg_runrecipe-y,toolchain))
+ $(eval __xtool_exists-y := $(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y))
+ $(eval __xtool_runrecipe-y := $(or $(__xtool_changed-y),$(__xtool_exists-y)))$(__xtool_runrecipe-y)
+endef
+
+__embtk_toolchain_addons_runrecipe-y = $(strip $(___embtk_toolchain_addons_runrecipe-y))
+define ___embtk_toolchain_addons_runrecipe-y
+ $(eval __xtool_addons_changed-y := $(call __embtk_pkg_runrecipe-y,toolchain_addons))
+ $(eval __xtool_exists-y := $(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y))
+ $(eval __xtool_runrecipe-y := $(or $(__xtool_addons_changed-y),$(__xtool_exists-y)))$(__xtool_runrecipe-y)
+endef
+
#
# binutils
#
@@ -242,20 +256,6 @@ define __embtk_toolchain_build
$(__embtk_toolchain_decompress))
endef
-__embtk_toolchain_runrecipe-y = $(strip $(___embtk_toolchain_runrecipe-y))
-define ___embtk_toolchain_runrecipe-y
- $(eval __xtool_changed-y := $(call __embtk_pkg_runrecipe-y,toolchain))
- $(eval __xtool_exists-y := $(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y))
- $(eval __xtool_runrecipe-y := $(or $(__xtool_changed-y),$(__xtool_exists-y)))$(__xtool_runrecipe-y)
-endef
-
-__embtk_toolchain_addons_runrecipe-y = $(strip $(___embtk_toolchain_addons_runrecipe-y))
-define ___embtk_toolchain_addons_runrecipe-y
- $(eval __xtool_addons_changed-y := $(call __embtk_pkg_runrecipe-y,toolchain_addons))
- $(eval __xtool_exists-y := $(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y))
- $(eval __xtool_runrecipe-y := $(or $(__xtool_addons_changed-y),$(__xtool_exists-y)))$(__xtool_runrecipe-y)
-endef
-
__embtk_toolchain_buildargs = $(if $(strip $(__embtk_toolchain_runrecipe-y)),core-addons)
__embtk_toolchain_buildargs += $(if $(strip $(__embtk_toolchain_addons_runrecipe-y)),addons)