Patchwork when overriding default tool names don't add cross-prefix

login
register
mail settings
Submitter Stuart Yoder
Date Aug. 4, 2011, 10:10 p.m.
Message ID <1312495808-22521-1-git-send-email-stuart.yoder@freescale.com>
Download mbox | patch
Permalink /patch/108579/
State New
Headers show

Comments

Stuart Yoder - Aug. 4, 2011, 10:10 p.m.
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(-)
Anthony Liguori - Aug. 5, 2011, 4:58 p.m.
On 08/04/2011 05:10 PM, Stuart yoder wrote:
> 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>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   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"

Patch

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"