Source

crosstool-ng-pq / 3082.diff

Full commit
# HG changeset patch
# User Cody Schafer <jmesmon@gmail.com>
# Date 1348521141 25200
# Node ID de4f2cc98766248c1cc8bc83e672f564c5009a96
# Parent  c130666cbf166e2be70125049b94b1b982eaf7c1
fix multilib for broken gcc configure

gcc's configure passes the --enable-multilib flags into target builds, which
breaks things (like zlib when using the bundled one).

Workaround by only passing the explicit --disable-multilib and omitting
--enable-multilib. According to the gcc bug report on this problem, all
platforms that use multilib enable it by default, so we can safely omit the
--enable-multilib and get a multilib toolchain.

diff -r c130666cbf16 -r de4f2cc98766 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Thu Jun 28 13:48:45 2012 -0700
+++ b/scripts/build/cc/gcc.sh	Mon Sep 24 14:12:21 2012 -0700
@@ -349,9 +349,7 @@
         extra_config+=("--with-system-zlib")
     fi
 
-    if [ "${CT_MULTILIB}" = "y" ]; then
-        extra_config+=("--enable-multilib")
-    else
+    if [ "${CT_MULTILIB}" = "n" ]; then
         extra_config+=("--disable-multilib")
     fi