From 023f26c9f42eca6618bbf32b55addd624361899e Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 19 Jan 2013 23:02:36 +0100 Subject: Toolchain: MIPS/uClibc: fix incorrectly set variables in uClibc build system Signed-off-by: Abdoulaye Walsimou Gaye --- mk/uclibc.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mk/uclibc.mk b/mk/uclibc.mk index 65fc473..c22402e 100755 --- a/mk/uclibc.mk +++ b/mk/uclibc.mk @@ -49,6 +49,7 @@ EMBTK_UCLIBC_CFLAGS += $(EMBTK_TARGET_MARCH) -pipe # # uClibc libraries make options. # + UCLIBC_MAKE_OPTS := PREFIX="$(embtk_sysroot)/" UCLIBC_MAKE_OPTS += CROSS_COMPILER_PREFIX="$(CROSS_COMPILE)" UCLIBC_MAKE_OPTS += SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/" @@ -56,6 +57,19 @@ UCLIBC_MAKE_OPTS += RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" UCLIBC_MAKE_OPTS += KERNEL_HEADERS="$(embtk_sysroot)/usr/include/" UCLIBC_MAKE_OPTS += UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" +# FIXME: unset incorrect variables in uClibc (mainline) Rules.mak for MIPS +ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y) +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_1="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_2="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_3="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_4="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_MIPS32="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_MIPS32R2="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_ISA_MIPS64="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_N64_ABI="" +UCLIBC_MAKE_OPTS += CONFIG_MIPS_N32_ABI="" +endif + # # Install dummy uClibc needed to build gcc stage 2 # -- cgit v1.2.3