From e474a0dee5def098ea16226ede75a535f34e7cd8 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 21 Jan 2012 14:35:09 +0100 Subject: Toolchain: fix build of addons Signed-off-by: Abdoulaye Walsimou Gaye --- mk/toolchain.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mk/toolchain.mk') diff --git a/mk/toolchain.mk b/mk/toolchain.mk index ecbdf09..9f5ee6b 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -140,6 +140,8 @@ define __embtk_toolchain_decompress $(___embtk_toolchain_decompress) endef +__embtk_toolchain_addons-y = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-y)) +__embtk_toolchain_addons-n = $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-)) define __embtk_toolchain_build $(if $(findstring core,$(1)), $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) CORE toolchain - please wait...") @@ -156,11 +158,11 @@ define __embtk_toolchain_build rm -rf $(TOOLCHAIN_ADDONS_BUILD_DIR)/.installed $(if $(findstring core,$(1)),,$(___embtk_toolchain_decompress)) $(if $(findstring core,$(1)), - $(foreach addon, - $(patsubst %_install,%,$(TOOLCHAIN_ADDONS-y)), + $(foreach addon,$(__embtk_toolchain_addons-y), + $(MAKE) $(addon)_clean;)) + $(if $(TOOLCHAIN_ADDONS-), + $(foreach addon,$(__embtk_toolchain_addons-n), $(MAKE) $(addon)_clean;)) - $(foreach addon,$(patsubst %_install,%,$(TOOLCHAIN_ADDONS-)), - $(MAKE) $(addon)_clean;) $(if $(TOOLCHAIN_ADDONS-y), $(MAKE) $(TOOLCHAIN_PRE_DEPS) $(TOOLCHAIN_ADDONS-y)) touch $(TOOLCHAIN_ADDONS_BUILD_DIR)/.installed) -- cgit v1.2.3