diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/binutils.mk | 10 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index c33259057..8ab383b3c 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -36,11 +36,11 @@ BINUTILS_ADD_MPC = y endif ifeq ($(BINUTILS_ADD_MPC),y) -BINUTILS_HOST_PREREQ += $(TOOLCHAIN_DIR)/mpc/lib/libmpc$(HOST_LIBEXT) -HOST_SOURCE += host-libmpc-source -BINUTILS_TARGET_PREREQ += $(TARGET_DIR)/usr/lib/libmpc$(LIBTGTEXT) -EXTRA_BINUTILS_CONFIG_OPTIONS += --with-mpc="$(MPC_HOST_DIR)" -BINUTILS_TARGET_CONFIG_OPTIONS += --with-mpc="$(MPC_TARGET_DIR)" +BINUTILS_HOST_PREREQ += host-mpc +HOST_SOURCE += host-mpc-source +BINUTILS_TARGET_PREREQ += mpc +EXTRA_BINUTILS_CONFIG_OPTIONS += --with-mpc=$(HOST_DIR)/usr +BINUTILS_TARGET_CONFIG_OPTIONS += --with-mpc=$(STAGING_DIR)/usr endif BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index f454be84a..9e7127dc1 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -111,8 +111,8 @@ GCC_WITH_HOST_MPFR = --with-mpfr=$(HOST_DIR)/usr HOST_SOURCE += host-gmp-source host-mpfr-source ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) -GCC_WITH_HOST_MPC=--with-mpc=$(MPC_HOST_DIR) -HOST_SOURCE += host-libmpc-source +GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr +HOST_SOURCE += host-mpc-source endif ifeq ($(BR2_INSTALL_FORTRAN),y) @@ -122,7 +122,7 @@ GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran GCC_WITH_TARGET_GMP = --with-gmp=$(STAGING_DIR)/usr GCC_WITH_TARGET_MPFR = --with-mpfr=$(STAGING_DIR)/usr ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) -GCC_WITH_TARGET_MPC=--with-mpc="$(MPC_TARGET_DIR)" +GCC_WITH_TARGET_MPC = --with-mpc=$(STAGING_DIR)/usr endif endif |