diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-12 00:03:10 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-09-12 00:03:40 +0200 |
| commit | 06aa4f3ebffcf78b5fd3245171fc7b13a8e2ef32 (patch) | |
| tree | 7264e87fccedfd6dbfeb4671bff60b3d0d842794 /core/toolchain/gcc | |
| parent | b1fb4b94943becfce0d4b7be268295bfffccceea (diff) | |
| download | embtoolkit-06aa4f3ebffcf78b5fd3245171fc7b13a8e2ef32.tar.gz embtoolkit-06aa4f3ebffcf78b5fd3245171fc7b13a8e2ef32.tar.bz2 embtoolkit-06aa4f3ebffcf78b5fd3245171fc7b13a8e2ef32.tar.xz | |
Toolchain: move gmp, mpfr and gmp under host tools
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core/toolchain/gcc')
| -rw-r--r-- | core/toolchain/gcc/gcc.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/core/toolchain/gcc/gcc.mk b/core/toolchain/gcc/gcc.mk index 1ca6145..b373c8d 100644 --- a/core/toolchain/gcc/gcc.mk +++ b/core/toolchain/gcc/gcc.mk @@ -31,6 +31,7 @@ GCC_PACKAGE := gcc-$(GCC_VERSION).tar.bz2 GCC_SRC_DIR := $(embtk_toolsb)/gcc-$(GCC_VERSION) GCC_MULTILIB := --disable-multilib +GCC_DEPS := gmp_host_install mpfr_host_install mpc_host_install # # Selected languages to support in the toolchain @@ -114,14 +115,16 @@ GCC1_BUILD_DIR := $(embtk_toolsb)/gcc1-build GCC1_KCONFIGS_NAME := GCC GCC1_KEEP_SRC_DIR := y +GCC1_DEPS := $(GCC_DEPS) + GCC1_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC1_PREFIX := $(embtk_tools) GCC1_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ - --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \ - --with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL) \ + --with-gmp=$(embtk_htools) --with-mpfr=$(embtk_htools) \ + --with-mpc=$(embtk_htools) --with-bugurl=$(EMBTK_BUGURL) \ --with-pkgversion=embtoolkit-$(EMBTK_VERSION) \ --without-headers --with-newlib --disable-shared --disable-threads \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ @@ -144,14 +147,16 @@ GCC2_BUILD_DIR := $(embtk_toolsb)/gcc2-build GCC2_KCONFIGS_NAME := GCC GCC2_KEEP_SRC_DIR := y +GCC2_DEPS := $(GCC_DEPS) + GCC2_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC2_PREFIX := $(embtk_tools) GCC2_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ - --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \ - --with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL) \ + --with-gmp=$(embtk_htools) --with-mpfr=$(embtk_htools) \ + --with-mpc=$(embtk_htools) --with-bugurl=$(EMBTK_BUGURL) \ --with-pkgversion=embtoolkit-$(EMBTK_VERSION) \ --disable-libquadmath \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ @@ -178,14 +183,16 @@ GCC3_SRC_DIR := $(GCC_SRC_DIR) GCC3_BUILD_DIR := $(embtk_toolsb)/gcc3-build GCC3_KCONFIGS_NAME := GCC +GCC3_DEPS := $(GCC_DEPS) + GCC3_MAKE_ENV := PATH=$(PATH):$(embtk_tools)/bin GCC3_PREFIX := $(embtk_tools) GCC3_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \ --target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) \ $(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE) \ $(GCC_MULTILIB) \ - --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \ - --with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL) \ + --with-gmp=$(embtk_htools)/usr --with-mpfr=$(embtk_htools)/usr \ + --with-mpc=$(embtk_htools)/usr --with-bugurl=$(EMBTK_BUGURL) \ --with-pkgversion=embtoolkit-$(EMBTK_VERSION) \ --disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \ --disable-libquadmath \ |