summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-01-21 14:35:09 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-01-21 14:35:09 +0100
commite474a0dee5def098ea16226ede75a535f34e7cd8 (patch)
tree51fc6779a0a9a327190acb738fb4e4a12e652fb7 /mk
parent5037be7fc10a4c090a41865dd3c7b327466d9596 (diff)
downloadembtoolkit-e474a0dee5def098ea16226ede75a535f34e7cd8.tar.gz
embtoolkit-e474a0dee5def098ea16226ede75a535f34e7cd8.tar.bz2
embtoolkit-e474a0dee5def098ea16226ede75a535f34e7cd8.tar.xz
Toolchain: fix build of addons
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/toolchain.mk10
1 files changed, 6 insertions, 4 deletions
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)