diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-16 23:43:02 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-16 23:43:02 +0200 |
| commit | b68447fed536abc1a686ab3b00a47b091f4641bb (patch) | |
| tree | 7c01b8b3cb0840aa8002748d46026a2353db05a1 | |
| parent | 93d493cf2f8a83d6c4f43d17e2234bba2693a1fe (diff) | |
| download | embtoolkit-b68447fed536abc1a686ab3b00a47b091f4641bb.tar.gz embtoolkit-b68447fed536abc1a686ab3b00a47b091f4641bb.tar.bz2 embtoolkit-b68447fed536abc1a686ab3b00a47b091f4641bb.tar.xz | |
Toolchain: move install of predeps to common place
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | core/toolchain/common.mk | 1 | ||||
| -rw-r--r-- | core/toolchain/core.mk | 3 | ||||
| -rw-r--r-- | core/toolchain/toolchain.mk | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/core/toolchain/common.mk b/core/toolchain/common.mk index a69f851..5270d3a 100644 --- a/core/toolchain/common.mk +++ b/core/toolchain/common.mk @@ -104,5 +104,4 @@ define ___embtk_toolchain_decompress rm -rf $(embtk_sysroot) $(embtk_tools) cd $(embtk_generated) && tar xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) $(__embtk_toolchain_mkinitdirs) - $(MAKE) $(EMBTK_TOOLCHAIN_PREDEPS-y) endef diff --git a/core/toolchain/core.mk b/core/toolchain/core.mk index 60620c3..f010001 100644 --- a/core/toolchain/core.mk +++ b/core/toolchain/core.mk @@ -58,7 +58,6 @@ endif # # Toolchain core build recipe # -__embtk_toolchain_predeps-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_PREDEPS-y)) __embtk_toolchain_deps-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_DEPS-y)) __embtk_toolchain_built_msg = $(call embtk_pinfo,"New $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain successfully built!") __embtk_toolchain_building_msg = $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) CORE toolchain - please wait...") @@ -75,8 +74,6 @@ define __embtk_toolchain_core_build $(call embtk_cleanup_pkg,$(pkgn))) rm -rf $(embtk_sysroot) $(embtk_tools) $(__embtk_toolchain_mkinitdirs) - $(foreach pdep,$(__embtk_toolchain_predeps-y), - $(call embtk_install_xpkg,$(pdep))) $(foreach dep,$(__embtk_toolchain_deps-y), $(call embtk_install_xpkg,$(dep))) $(call __embtk_setinstalled_pkg,toolchain) diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index 4778157..9f361a6 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -39,10 +39,13 @@ include packages/htools/automake/vars.mk include core/toolchain/core.mk include core/toolchain/addons.mk +__embtk_toolchain_predeps-y = $(patsubst %_install,%,$(EMBTK_TOOLCHAIN_PREDEPS-y)) define __embtk_toolchain_build $(eval __xtool_build := $(if $(__embtk_toolchain_runrecipe-y),core)) $(eval __xtool_addons_build := $(if $(__embtk_toolchain_addons_runrecipe-y),addons)) $(eval __xtool_build_args := $(strip $(__xtool_build) $(__xtool_addons_build))) + $(__embtk_toolchain_mkinitdirs) + $(foreach pdep,$(__embtk_toolchain_predeps-y),$(call embtk_install_xpkg,$(pdep))) $(if $(__xtool_build), $(call __embtk_toolchain_core_build,$(__xtool_build_args))) $(if $(__xtool_addons_build), |