From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22244 invoked by alias); 23 Nov 2011 11:57:02 -0000 Received: (qmail 22235 invoked by uid 22791); 23 Nov 2011 11:57:01 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 Nov 2011 11:56:48 +0000 Received: by iaek3 with SMTP id k3so2101771iae.0 for ; Wed, 23 Nov 2011 03:56:48 -0800 (PST) Received: by 10.42.117.193 with SMTP id u1mr2653023icq.24.1322049407239; Wed, 23 Nov 2011 03:56:47 -0800 (PST) Received: from [192.168.1.56] ([58.37.193.48]) by mx.google.com with ESMTPS id g16sm72612669ibs.8.2011.11.23.03.56.37 (version=SSLv3 cipher=OTHER); Wed, 23 Nov 2011 03:56:45 -0800 (PST) Message-ID: <4ECCDF6C.1010302@linaro.org> Date: Wed, 23 Nov 2011 11:57:00 -0000 From: Zhenqiang Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: yann.morin.1998@anciens.enib.fr CC: crossgcc@sourceware.org Subject: [updated zlib PATCH 2 of 3] binutils/binutils: use the prebuilt zlib Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00150.txt.bz2 # HG changeset patch # User Zhenqiang Chen # Date 1322037380 -28800 # Node ID d681a5a526e81fdda839a04b27fcb6bce50f65a7 # Parent ffb01c946be470adbd63b2a2f4784bd01fa25771 binutils/binutils: use the prebuilt zlib to build binutils to remove the dependence on system zlib. Signed-off-by: Zhenqiang Chen diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -75,6 +75,7 @@ config BINUTILS_2_18_or_later bool select BINUTILS_HAS_PKGVERSION_BUGURL + select ZLIB_NEEDED config BINUTILS_HAS_GOLD bool diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -22,6 +22,8 @@ local -a binutils_tools local -a manuals_for local -a manuals_install + local -a binutils_CFLAGS + local -a binutils_LDFLAGS mkdir -p "${CT_BUILD_DIR}/build-binutils" cd "${CT_BUILD_DIR}/build-binutils" @@ -66,9 +68,16 @@ CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" + binutils_CFLAGS=${CT_CFLAGS_FOR_HOST} + if [ "${CT_ZLIB_NEEDED}" = "y" ]; then + binutils_CFLAGS+=" -I${CT_COMPLIBS_DIR}/zlib/include" + binutils_LDFLAGS+=" -L${CT_COMPLIBS_DIR}/zlib/lib" + fi + CT_DoExecLog CFG \ - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - CXXFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CFLAGS="${binutils_CFLAGS}" \ + CXXFLAGS="${binutils_CFLAGS}" \ + LDFLAGS="${binutils_LDFLAGS}" \ "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ --build=${CT_BUILD} \ --host=${CT_HOST} \ -- For unsubscribe information see http://sourceware.org/lists.html#faq