From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 17 Oct 2016 08:11:21 +0000 (+0200)
Subject: toolchain-binutils.eclass: Don't use bundled zlib (bug #591516).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c1495faa17c824d18ca53e263703431f8d19117;p=gentoo.git

toolchain-binutils.eclass: Don't use bundled zlib (bug #591516).
---

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 46e972a87805..2445a722b7be 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -89,7 +89,7 @@ else
 	LICENSE="|| ( GPL-2 LGPL-2 )"
 fi
 IUSE="cxx multitarget nls static-libs test vanilla"
-if version_is_at_least 2.19 ; then
+if ! version_is_at_least 2.26 ; then
 	IUSE+=" zlib"
 fi
 SLOT="${BVER}"
@@ -263,6 +263,8 @@ toolchain-binutils_src_configure() {
 		# older versions did not have an explicit configure flag
 		export ac_cv_search_zlibVersion=$(usex zlib -lz no)
 		myconf+=( $(use_with zlib) )
+	else
+		myconf+=( --with-system-zlib )
 	fi
 
 	# For bi-arch systems, enable a 64bit bfd.  This matches