diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-02-03 21:38:11 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-02-03 21:38:11 +0100 |
| commit | 54ad3c2e37f06b0b888515c76556012afb50465e (patch) | |
| tree | df761350b6b616748eca26f8f006d787333cfd4c /mk | |
| parent | ed1ed9bf360c8dbca99e549ba29c48f5e63f3ee9 (diff) | |
| download | embtoolkit-54ad3c2e37f06b0b888515c76556012afb50465e.tar.gz embtoolkit-54ad3c2e37f06b0b888515c76556012afb50465e.tar.bz2 embtoolkit-54ad3c2e37f06b0b888515c76556012afb50465e.tar.xz | |
Build system: tweak a little macros for directories creation
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildsystem.mk | 19 | ||||
| -rw-r--r-- | mk/toolchain.mk | 13 |
2 files changed, 11 insertions, 21 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 5de979c..5e377ef 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -131,7 +131,7 @@ define __embtk_mk_initsysrootdirs mkdir -p $(SYSROOT)/usr/lib $(if $(CONFIG_EMBTK_32BITS_FS),,cd $(SYSROOT); \ ln -sf lib lib64; cd $(SYSROOT)/usr;ln -sf lib lib64) - $(Q)$(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ + $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32), \ cd $(SYSROOT); ln -sf lib lib64; mkdir -p lib32; \ cd $(SYSROOT)/usr; ln -sf lib lib64; mkdir -p lib32) endef @@ -148,23 +148,6 @@ define __embtk_mk_inithosttoolsdirs mkdir -p $(HOSTTOOLS)/usr/local endef -define __embtk_mk_initrootfsdirs - $(if $(CONFIG_EMBTK_HAVE_ROOTFS), \ - mkdir -p $(ROOTFS); \ - cp -Rp $(EMBTK_ROOT)/src/target_skeleton/* $(ROOTFS)/; \ - mkdir -p $(PACKAGES_BUILD)) -endef - -define __embtk_mk_initialpath - $(__embtk_mk_initsysrootdirs) - $(__embtk_mk_inittoolsdirs) - $(__embtk_mk_inithosttoolsdirs) - $(__embtk_mk_initrootfsdirs) -endef - -mkinitialpath: - $(Q)$(__embtk_mk_initialpath) - rmallpath: $(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(TOOLS)* $(TOOLS_BUILD)* $(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* diff --git a/mk/toolchain.mk b/mk/toolchain.mk index bde654e..d9efc6a 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -118,6 +118,12 @@ TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_BUILD_DIR)/.addons include $(EMBTK_ROOT)/mk/$(__embtk_toolchain_clib).mk +define __embtk_toolchain_mkinitdirs + $(__embtk_mk_initsysrootdirs) + $(__embtk_mk_inittoolsdirs) + $(__embtk_mk_inithosttoolsdirs) +endef + define __embtk_toolchain_symlinktools cd $(TOOLS)/bin; \ tools=$$(ls $(STRICT_GNU_TARGET)-*); \ @@ -135,7 +141,8 @@ endef define ___embtk_toolchain_decompress cd $(EMBTK_ROOT) && tar xjf $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE) - $(MAKE) mkinitialpath $(TOOLCHAIN_PRE_DEPS-y) + $(__embtk_toolchain_mkinitdirs) + $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) mkdir -p $(GCC3_BUILD_DIR) touch $(GCC3_BUILD_DIR)/.installed touch $(GCC3_BUILD_DIR)/.gcc3_post_install @@ -160,8 +167,8 @@ define __embtk_toolchain_build rm -rf $(call __embtk_pkg_builddir,$(dep));) $(foreach pkg,$(__embtk_rootfs_pkgs-y),$(MAKE) $(pkg)_clean;) rm -rf $(SYSROOT) - $(__embtk_mk_initsysrootdirs) - $(MAKE) mkinitialpath $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS) + $(__embtk_toolchain_mkinitdirs) + $(MAKE) $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS) touch $(TOOLCHAIN_DIR)/.installed) $(if $(findstring addons,$(1)), $(call embtk_pinfo,"Building new $(GNU_TARGET)/$(EMBTK_MCU_FLAG) toolchain ADDONS - please wait...") |