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 ddf9f39013bde2223b399c2e693be3ecc04c97a9..85b605ea16b727682116ac989e440f8bc4d3dbed 100644 (file)
--- 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 d140db16796ad3690936d8365c2d3a3593105dd0..0b7fd4896fe330c633da8fa92c367f52a93802a6 100644 (file)
--- 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) \