From c8180091bf37c277a8f41a129ede208efc9de0f5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 26 May 2013 06:16:52 +0200
Subject: [PATCH] binutils: don't use sysroot in cross builds, only use it to
 build.

---
 srcpkgs/binutils/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index d302e9779a6..3fadae6086a 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.23.52.0.2
-revision=2
+revision=3
 hostmakedepends="flex perl"
 makedepends="zlib-devel"
 short_desc="GNU binary utilities"
@@ -19,8 +19,12 @@ do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
 	fi
-
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+	if [ "$CROSS_BUILD" ]; then
+		# Do not use CONFIGURE_SHARED_ARGS nor build_style=gnu-configure,
+		# avoiding --with-sysroot to $XBPS_CROSS_BASE.
+		CONFIGFLAG="--host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE"
+	fi
+	./configure --prefix=/usr --enable-threads \
 		--enable-plugins --enable-secureplt --with-mmap \
 		--enable-shared --disable-bootstrap $CONFIGFLAG
 }