summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-01-21 18:22:13 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-01-21 18:22:13 +0100
commitd6cd434d703ddb1a6d5ba813d6533408b45850d5 (patch)
treec09c1481cd7823c55c7c705f2777b29fabf0a922 /mk
parent07b392e518ddfe0cb5963a08f12568fd62bcc108 (diff)
downloadembtoolkit-d6cd434d703ddb1a6d5ba813d6533408b45850d5.tar.gz
embtoolkit-d6cd434d703ddb1a6d5ba813d6533408b45850d5.tar.bz2
embtoolkit-d6cd434d703ddb1a6d5ba813d6533408b45850d5.tar.xz
Toolchain: create internal macro to get used c library
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/buildsystem.mk2
-rw-r--r--mk/toolchain.mk12
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index 11b79f0..77ef1ad 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -92,7 +92,7 @@ define __embtk_mk_startbuild
$(call embtk_echo_blue,"| Toolchain |")
$(call embtk_echo_blue," ~~~~~~~~~~~ ")
$(call embtk_echo_blue,"\tLinux kernel headers: linux-$(call embtk_get_pkgversion,linux)")
- $(call embtk_echo_blue,"\tC library :")
+ $(call embtk_echo_blue,"\tC library : $(__embtk_toolchain_clib)")
$(call embtk_echo_blue,"\tBinutils : binutils-$(call embtk_get_pkgversion,binutils)")
$(call embtk_echo_blue,"\tGCC : gcc-$(call embtk_get_pkgversion,gcc)")
$(if $(CONFIG_EMBTK_HAVE_GDB_SYSTEM),
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 7520552..14d35ef 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -90,25 +90,25 @@ AUTOTOOLS_INSTALL += automake_install
include $(EMBTK_ROOT)/mk/cmake.mk
EMBTK_CMAKE_INSTALL := $(if $(CONFIG_EMBTK_HOST_HAVE_CMAKE),cmake_install)
+__embtk_toolchain_clib = $(if $(CONFIG_EMBTK_CLIB_EGLIBC),eglibc,uclibc)
TOOLCHAIN_NAME := toolchain
-TOOLCHAIN_PACKAGE := toolchain-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2
-TOOLCHAIN_DIR := $(EMBTK_GENERATED)/toolchain-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
+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_BUILD_DIR := $(TOOLCHAIN_DIR)
-TOOLCHAIN_CLIB := $(if $(CONFIG_EMBTK_CLIB_EGLIBC),eglibc,uclibc)
TOOLCHAIN_PRE_DEPS := ccache_install $(AUTOTOOLS_INSTALL)
TOOLCHAIN_PRE_DEPS += $(EMBTK_CMAKE_INSTALL)
TOOLCHAIN_DEPS := linux_headers_install gmp_host_install
TOOLCHAIN_DEPS += mpfr_host_install mpc_host_install binutils_install
-TOOLCHAIN_DEPS += gcc1_install $(TOOLCHAIN_CLIB)_headers_install
-TOOLCHAIN_DEPS += gcc2_install $(TOOLCHAIN_CLIB)_install gcc3_install
+TOOLCHAIN_DEPS += gcc1_install $(__embtk_toolchain_clib)_headers_install
+TOOLCHAIN_DEPS += gcc2_install $(__embtk_toolchain_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/$(TOOLCHAIN_CLIB).mk
+include $(EMBTK_ROOT)/mk/$(__embtk_toolchain_clib).mk
define __embtk_toolchain_symlinktools
cd $(TOOLS)/bin; \