diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/buildsystem.mk | 2 | ||||
-rw-r--r-- | mk/toolchain.mk | 12 |
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; \ |