From 5b06078d2df2810d0f9404452588ce285715855d Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Mon, 15 Sep 2014 00:30:08 +0200 Subject: Toolhcain: tweak internal macros detecting if build of new toolchain is needed Signed-off-by: Abdoulaye Walsimou Gaye --- core/toolchain/toolchain.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index 5b9b194..b987df6 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -242,12 +242,18 @@ define __embtk_toolchain_build $(__embtk_toolchain_decompress)) endef -define __embtk_toolchain_runrecipe-y - $(or $(call __embtk_pkg_runrecipe-y,toolchain),$(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y)) +__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 -define __embtk_toolchain_addons_runrecipe-y - $(or $(call __embtk_pkg_runrecipe-y,toolchain_addons),$(if $(wildcard $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)),,y)) +__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) -- cgit v1.2.3