diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-06 19:59:31 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-06 19:59:31 +0200 |
| commit | 8d38553beb87af2b268217e1514d1386ac978be1 (patch) | |
| tree | 5bd0f58db17ff9501c464e51eb65d056e3eab584 /mk | |
| parent | 9dedb3d0be81d8bd112c2e364b7a2f52a7e4e143 (diff) | |
| download | embtoolkit-8d38553beb87af2b268217e1514d1386ac978be1.tar.gz embtoolkit-8d38553beb87af2b268217e1514d1386ac978be1.tar.bz2 embtoolkit-8d38553beb87af2b268217e1514d1386ac978be1.tar.xz | |
Build system: replace __embtk_toolchain_clib -> embtk_clib
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/rootfs.mk | 8 | ||||
| -rw-r--r-- | mk/toolchain.mk | 16 |
2 files changed, 10 insertions, 14 deletions
diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 4289ec9..f8042a2 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,10 +27,10 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y) # Include various filesystems macros include $(EMBTK_ROOT)/mk/fs.mk -ROOTFS_JFFS2 := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).jffs2 -ROOTFS_TARBZ2 := rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).tar.bz2 -ROOTFS_SQUASHFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).squashfs -ROOTFS_INITRAMFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).initramfs +ROOTFS_JFFS2 := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).jffs2 +ROOTFS_TARBZ2 := rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).tar.bz2 +ROOTFS_SQUASHFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).squashfs +ROOTFS_INITRAMFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).initramfs HOSTTOOLS_COMPONENTS-y += makedevs_install fakeroot_install HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtdutils_host_install diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 4908840..f1120ef 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -91,14 +91,10 @@ include $(EMBTK_ROOT)/mk/m4.mk AUTOTOOLS_INSTALL := m4_install libtool_install autoconf_install AUTOTOOLS_INSTALL += automake_install -# C library to use for the toolchain -__embtk_toolchain_clib-$(CONFIG_EMBTK_CLIB_EGLIBC) := eglibc -__embtk_toolchain_clib-$(CONFIG_EMBTK_CLIB_UCLIBC) := uclibc -__embtk_toolchain_clib = $(or $(__embtk_toolchain_clib-y),BUG_NO_C_LIB) - +# Toolchain internals TOOLCHAIN_NAME := toolchain -TOOLCHAIN_PACKAGE := toolchain-$(GNU_TARGET)-$(__embtk_toolchain_clib)-$(EMBTK_MCU_FLAG).tar.bz2 -TOOLCHAIN_DIR := $(embtk_generated)/toolchain-$(GNU_TARGET)-$(__embtk_toolchain_clib)-$(EMBTK_MCU_FLAG) +TOOLCHAIN_PACKAGE := toolchain-$(GNU_TARGET)-$(embtk_clib)-$(EMBTK_MCU_FLAG).tar.bz2 +TOOLCHAIN_DIR := $(embtk_generated)/toolchain-$(GNU_TARGET)-$(embtk_clib)-$(EMBTK_MCU_FLAG) TOOLCHAIN_BUILD_DIR := $(TOOLCHAIN_DIR) TOOLCHAIN_PRE_DEPS-y := ccache_install $(AUTOTOOLS_INSTALL) @@ -107,14 +103,14 @@ TOOLCHAIN_PRE_DEPS-y += $(if $(CONFIG_EMBTK_TOOLCHAIN_PREDEP_GPERF_HOST), \ TOOLCHAIN_DEPS := linux_headers_install gmp_host_install TOOLCHAIN_DEPS += mpfr_host_install mpc_host_install binutils_install -TOOLCHAIN_DEPS += gcc1_install $(__embtk_toolchain_clib)_headers_install -TOOLCHAIN_DEPS += gcc2_install $(__embtk_toolchain_clib)_install gcc3_install +TOOLCHAIN_DEPS += gcc1_install $(embtk_clib)_headers_install +TOOLCHAIN_DEPS += gcc2_install $(embtk_clib)_install gcc3_install TOOLCHAIN_ADDONS_NAME := toolchain-addons TOOLCHAIN_ADDONS_DEPS := $(TOOLCHAIN_ADDONS-y) TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_BUILD_DIR)/.addons --include $(EMBTK_ROOT)/mk/$(__embtk_toolchain_clib).mk +-include $(EMBTK_ROOT)/mk/$(embtk_clib).mk define __embtk_toolchain_mkinitdirs $(__embtk_mk_initsysrootdirs) |