summaryrefslogtreecommitdiff
path: root/core/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'core/toolchain')
-rw-r--r--core/toolchain/addons.mk2
-rw-r--r--core/toolchain/common.mk8
-rw-r--r--core/toolchain/core.mk1
3 files changed, 5 insertions, 6 deletions
diff --git a/core/toolchain/addons.mk b/core/toolchain/addons.mk
index e52b366..cd61ced 100644
--- a/core/toolchain/addons.mk
+++ b/core/toolchain/addons.mk
@@ -29,7 +29,7 @@ TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain_addons
# Include .kconfig symbols if any
-include $(call __embtk_pkg_dotkconfig_f,toolchain_addons)
-
+__embtk_toolchain_addons_installed := $(__embtk_toolchain_addons_runrecipe-y)
#
# Toolchain addons build recipe
diff --git a/core/toolchain/common.mk b/core/toolchain/common.mk
index 59a72e0..76ff51e 100644
--- a/core/toolchain/common.mk
+++ b/core/toolchain/common.mk
@@ -91,10 +91,8 @@ endef
# Toolchain compress/uncompress macros
#
define __embtk_toolchain_compress
- cd $(embtk_generated); \
- tar -cjf $(TOOLCHAIN_PACKAGE) \
- $(notdir $(embtk_sysroot)) $(notdir $(embtk_tools)) && \
- mv $(TOOLCHAIN_PACKAGE) $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)
+ tar -C $(embtk_generated) -cjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) \
+ $(notdir $(embtk_sysroot)) $(notdir $(embtk_tools))
endef
define __embtk_toolchain_decompress
@@ -105,6 +103,6 @@ define __embtk_toolchain_decompress
endef
define ___embtk_toolchain_decompress
rm -rf $(embtk_sysroot) $(embtk_tools)
- cd $(embtk_generated) && tar xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)
+ tar -C $(embtk_generated) -xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)
$(__embtk_toolchain_mkinitdirs)
endef
diff --git a/core/toolchain/core.mk b/core/toolchain/core.mk
index 1008936..a4ecf79 100644
--- a/core/toolchain/core.mk
+++ b/core/toolchain/core.mk
@@ -31,6 +31,7 @@ TOOLCHAIN_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain
# Include .kconfig symbols if any
-include $(call __embtk_pkg_dotkconfig_f,toolchain)
+__embtk_toolchain_installed := $(__embtk_toolchain_runrecipe-y)
__embtk_xtool_gcc3-$(CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN) := gcc3_install
__embtk_xtool_gcc3-$(CONFIG_EMBTK_GCC_DEFAULT_TOOLCHAIN) := gcc3_install