diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-24 12:53:42 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-24 12:53:42 +0100 |
| commit | d3c578148d628cb4f272a56eb5ea0681be529cd7 (patch) | |
| tree | 089d65630526ec8a2fa60a0aacda259448896304 | |
| parent | df5c5e8a1455d1fff1455ec094e9a1cbc1dc6686 (diff) | |
| download | embtoolkit-d3c578148d628cb4f272a56eb5ea0681be529cd7.tar.gz embtoolkit-d3c578148d628cb4f272a56eb5ea0681be529cd7.tar.bz2 embtoolkit-d3c578148d628cb4f272a56eb5ea0681be529cd7.tar.xz | |
Build system: do not rely on gcc stage 3 to know if the toolchain is installed or not
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/buildsystem.mk | 3 | ||||
| -rw-r--r-- | mk/toolchain.mk | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 85c2e3f..45beb1a 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -74,6 +74,7 @@ embtk_kconfig_basic: clean: toolchain_clean rmallpath $(Q)$(__embtk_kconfig_clean) $(Q)rm -rf .config kbuild.log .fakeroot* + $(Q)rm -rf $(embtk_generated)/toolchain*/*.embtk.decompressed distclean: clean $(Q)rm -rf dl/* src/*.git src/*.svn .config.old @@ -127,7 +128,7 @@ define __embtk_mk_startbuild endef startbuild: - $(if $(call __embtk_mk_pathexist,$(call __embtk_pkg_dotinstalled_f,gcc3)), \ + $(if $(wildcard $(call __embtk_pkg_dotdecompressed_f,toolchain)), \ $(__embtk_mk_pwarning_restartbuild),$(__embtk_mk_startbuild)) define __embtk_mk_initsysrootdirs diff --git a/mk/toolchain.mk b/mk/toolchain.mk index dff3275..8a245bb 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -213,10 +213,6 @@ define ___embtk_toolchain_decompress cd $(EMBTK_ROOT) && tar xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) $(__embtk_toolchain_mkinitdirs) $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) - mkdir -p $(GCC3_BUILD_DIR) - touch $(call __embtk_pkg_dotinstalled_f,gcc3) - touch $(GCC3_BUILD_DIR)/.gcc3_post_install - $(call __embtk_pkg_gen_dotkconfig_f,gcc3) endef define __embtk_toolchain_decompress |