diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-16 22:35:49 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-16 22:35:49 +0200 |
| commit | 6e1ff0e5ed337156f2152d88e7b983ddaf27b368 (patch) | |
| tree | da9cd5e7e94dcf70e91a93f0c1e45072e30206b4 | |
| parent | a3c60517157a571f2b9efc1c8140eca7fcb728ab (diff) | |
| download | embtoolkit-6e1ff0e5ed337156f2152d88e7b983ddaf27b368.tar.gz embtoolkit-6e1ff0e5ed337156f2152d88e7b983ddaf27b368.tar.bz2 embtoolkit-6e1ff0e5ed337156f2152d88e7b983ddaf27b368.tar.xz | |
Toolchain: move gmp, mpfr and mpc among toolchain deps
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | core/toolchain/core.mk | 34 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.mk | 9 |
2 files changed, 25 insertions, 18 deletions
diff --git a/core/toolchain/core.mk b/core/toolchain/core.mk index 9395c77..f7fb7b9 100644 --- a/core/toolchain/core.mk +++ b/core/toolchain/core.mk @@ -55,15 +55,6 @@ else __embtk_xtool_compiler-rt-$(CONFIG_EMBTK_HAVE_COMPILER-RT) := compiler-rt_install endif -EMBTK_TOOLCHAIN_DEPS-y := linux_headers_install binutils_install -EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_HOST_HAVE_LLVM) += llvm_host_install -EMBTK_TOOLCHAIN_DEPS-y += gcc1_install -EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install -EMBTK_TOOLCHAIN_DEPS-y += $(embtk_clib)_install -EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_gcc3-y) -EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_compiler-rt-y) -TOOLCHAIN_DEPS := $(EMBTK_TOOLCHAIN_DEPS-y) - # # Toolchain core build recipe # @@ -92,6 +83,31 @@ define __embtk_toolchain_core_build $(call __embtk_pkg_gen_dotkconfig_f,toolchain) endef + +# +# Toolchain core dependencies +# +embtk_pkgincdir := packages/htools + +# gmp +$(call embtk_include_xtoolpkg,gmp_host,toolchain_deps) + +# mpfr +$(call embtk_include_xtoolpkg,mpfr_host,toolchain_deps) + +# mpc +$(call embtk_include_xtoolpkg,mpc_host,toolchain_deps) + +EMBTK_TOOLCHAIN_DEPS-y += linux_headers_install binutils_install +EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_HOST_HAVE_LLVM) += llvm_host_install +EMBTK_TOOLCHAIN_DEPS-y += gcc1_install +EMBTK_TOOLCHAIN_DEPS-$(CONFIG_EMBTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install +EMBTK_TOOLCHAIN_DEPS-y += $(embtk_clib)_install +EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_gcc3-y) +EMBTK_TOOLCHAIN_DEPS-y += $(__embtk_xtool_compiler-rt-y) +TOOLCHAIN_DEPS := $(EMBTK_TOOLCHAIN_DEPS-y) + + # # binutils # diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 3ff097b..b54e7e6 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -41,9 +41,6 @@ $(call embtk_include_hostpkg,fakeroot_host) # gmake $(call embtk_include_hostpkg,gmake_host) -# gmp -$(call embtk_include_hostpkg,gmp_host) - # gperf $(call embtk_include_hostpkg,gperf_host) @@ -56,12 +53,6 @@ $(call embtk_include_hostpkg,libelf_host) # libtool $(call embtk_include_hostpkg,libtool_host) -# mpc -$(call embtk_include_hostpkg,mpc_host) - -# mpfr -$(call embtk_include_hostpkg,mpfr_host) - # mtd-utils $(call embtk_include_hostpkg,mtdutils_host) |