From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 30 Jul 2010 07:31:39 +0000 (+0200)
Subject: toolchain: enforce --disable-multilib
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d4f9ba707044fec2fa227c1e71db28e49807bae;p=buildroot.git

toolchain: enforce --disable-multilib

Since 5575d205c (toolchain: remove multilib) we were no longer passing
--disable-multilib, which broke builds for multilib-capable archs (like
x86-64, ppc, ..).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index ddf9f39013..85b605ea16 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -74,6 +74,7 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
 		$(BR2_CONFIGURE_DEVEL_SYSROOT) \
 		$(BR2_CONFIGURE_STAGING_SYSROOT) \
 		$(DISABLE_NLS) \
+		--disable-multilib \
 		--disable-werror \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 		$(EXTRA_BINUTILS_CONFIG_OPTIONS) \
@@ -128,6 +129,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched
 		--infodir=/usr/share/info \
 		$(DISABLE_NLS) \
 		$(BINUTILS_TARGET_CONFIG_OPTIONS) \
+		--disable-multilib \
 		--disable-werror \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
 	)
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index d140db1679..0b7fd4896f 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -203,6 +203,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--disable-libssp \
 		--without-headers \
 		--with-newlib \
+		--disable-multilib \
 		$(GCC_TLS) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
@@ -272,6 +273,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		--with-gnu-ld \
 		--enable-shared \
 		--disable-libssp \
+		--disable-multilib \
 		$(GCC_TLS) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
@@ -353,6 +355,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		--enable-target-optspace \
 		--with-gnu-ld \
 		--disable-libssp \
+		--disable-multilib \
 		$(GCC_TLS) \
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_HOST_GMP) \
@@ -485,6 +488,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		--disable-__cxa_atexit \
 		--with-gnu-ld \
 		--disable-libssp \
+		--disable-multilib \
 		$(GCC_TLS) \
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_TARGET_GMP) \