summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-19 23:02:36 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-19 23:02:36 +0100
commit023f26c9f42eca6618bbf32b55addd624361899e (patch)
treedf83e6d264bf312fcc76b4ceedee7a14613e8e80
parent4a6d54fa549ab744ef859bdc676265e8ad285dbd (diff)
downloadembtoolkit-023f26c9f42eca6618bbf32b55addd624361899e.tar.gz
embtoolkit-023f26c9f42eca6618bbf32b55addd624361899e.tar.bz2
embtoolkit-023f26c9f42eca6618bbf32b55addd624361899e.tar.xz
Toolchain: MIPS/uClibc: fix incorrectly set variables in uClibc build system
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rwxr-xr-xmk/uclibc.mk14
1 files changed, 14 insertions, 0 deletions
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
#