Commit 8d4f9ba7 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain: enforce --disable-multilib 



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

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 9d42e194

toolchain/binutils/binutils.mk

+2 −0
Original line number Diff line number Diff line
@@ -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) \

	)

toolchain/gcc/gcc-uclibc-4.x.mk

+4 −0
Original line number Diff line number Diff line
@@ -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) \