From 92744ca68f2aeee36a62611d85adb50bb0b6530b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 31 Dec 2011 16:23:27 +0100
Subject: cc/gcc: add option to use system zlib

In some cases, it might be desirable to use the system zlib

Eg. because latest gcc seem to be totally borked when it comes
to multilib, and tries to build a multilib host zlib, when it
is *absolutely* *not* needed: we want mulitlib on the target,
not on the host! Sigh... :-(

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 35a1070..41f2be1 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -53,6 +53,19 @@ config CC_STATIC_LIBSTDCXX
       having to worry about distributing the matching version of libstdc++
       along with it.
 
+config CC_GCC_SYSTEM_ZLIB
+    bool
+    prompt "Use system zlib"
+    depends on EXPERIMENTAL
+    help
+      Do not use bundled zlib, and use the zlib already available for
+      the host (eg. the system library).
+      
+      If you want to build a static toolchain, you will need to also
+      install the static version of zlib for your host.
+      
+      If unsure, say 'n'.
+
 #-----------------------------------------------------------------------------
 # Optimisation features
 
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 71ae981..981e127 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -293,6 +293,10 @@ do_cc_core() {
 
     [ "${CT_CC_GCC_DISABLE_PCH}" = "y" ] && extra_config+=("--disable-libstdcxx-pch")
 
+    if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then
+        extra_config+=("--with-system-zlib")
+    fi
+
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
 
     # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
@@ -603,6 +607,10 @@ do_cc() {
 
     [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
 
+    if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then
+        extra_config+=("--with-system-zlib")
+    fi
+
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
 
     CT_DoExecLog CFG                                \
-- 
cgit v0.10.2-6-g49f6