From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:45595)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <B08248@freescale.com>) id 1Qp6Ct-0004L3-09
	for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:15:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <B08248@freescale.com>) id 1Qp6Cn-0006LF-V6
	for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:15:58 -0400
Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:5851
	helo=VA3EHSOBE009.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <B08248@freescale.com>) id 1Qp6Cn-0006L8-SI
	for qemu-devel@nongnu.org; Thu, 04 Aug 2011 18:15:53 -0400
From: Stuart yoder <stuart.yoder@freescale.com>
Date: Thu, 4 Aug 2011 17:10:08 -0500
Message-ID: <1312495808-22521-1-git-send-email-stuart.yoder@freescale.com>
MIME-Version: 1.0
Content-Type: text/plain
Subject: [Qemu-devel] [PATCH] when overriding default tool names don't add
	cross-prefix
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: anthony@codemonkey.ws, qemu-devel@nongnu.org
Cc: Stuart Yoder <stuart.yoder@freescale.com>

From: Stuart Yoder <stuart.yoder@freescale.com>

When overriding a tool name via a shell variable, don't
tack on the cross-prefix.  This specifically allows the
pkg-config command to be overridden and work where it
does not exist in some cross build environments.

Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
---
 configure |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 38e3724..ad522f2 100755
--- a/configure
+++ b/configure
@@ -217,14 +217,14 @@ done
 # Using uname is really, really broken.  Once we have the right set of checks
 # we can eliminate it's usage altogether
 
-cc="${cross_prefix}${CC-gcc}"
-ar="${cross_prefix}${AR-ar}"
-objcopy="${cross_prefix}${OBJCOPY-objcopy}"
-ld="${cross_prefix}${LD-ld}"
-strip="${cross_prefix}${STRIP-strip}"
-windres="${cross_prefix}${WINDRES-windres}"
-pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
-sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
+cc="${CC-${cross_prefix}gcc}"
+ar="${AR-${cross_prefix}ar}"
+objcopy="${OBJCOPY-${cross_prefix}objcopy}"
+ld="${LD-${cross_prefix}ld}"
+strip="${STRIP-${cross_prefix}strip}"
+windres="${WINDRES-${cross_prefix}windres}"
+pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
+sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
 
 # default flags for all hosts
 QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
-- 
1.7.3.4