From f598f71cd5eb10ebed7d4ae151c8a8f704d5becd Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 13 Oct 2020 17:09:40 -0500 Subject: [PATCH] build/cross_tools_gcc4: x86_64, explicit enable-multilib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * This was originally added circa 2012. via hrev43954 * Our toolchain appears to work fine now with explicit multilib enabled. Change-Id: I1f5d55c63a6b3b6ab1c4db95da3d14d5ef2da0df Reviewed-on: https://review.haiku-os.org/c/haiku/+/3315 Reviewed-by: Jérôme Duval --- build/scripts/build_cross_tools_gcc4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 4900af6b76..b5eefe340e 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -36,10 +36,8 @@ i586-*) gdbConfigureArgs="--disable-multilib" ;; x86_64-*) - # GCC's default is to enable multilib, but there is a bug when - # explicitly using --enable-multilib that causes a build - # failure - binutilsConfigureArgs="" + binutilsConfigureArgs="--enable-multilib" + gccConfigureArgs="--enable-multilib" binutilsTargets="$binutilsTargets,i386-efi-pe,x86_64-efi-pe" gdbConfigureArgs="--disable-multilib" ;;