summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorStuart Yoder2011-08-05 00:10:08 +0200
committerAnthony Liguori2011-08-05 18:55:12 +0200
commitb3198cc2eff816b6305bb5aba5b2a48f1cd944f4 (patch)
treedeb04df064e775b59d77df347892abb3625054f4 /configure
parentReorganize and fix monitor resume after migration (diff)
downloadqemu-b3198cc2eff816b6305bb5aba5b2a48f1cd944f4.tar.gz
qemu-b3198cc2eff816b6305bb5aba5b2a48f1cd944f4.tar.xz
qemu-b3198cc2eff816b6305bb5aba5b2a48f1cd944f4.zip
when overriding default tool names don't add cross-prefix
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> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure b/configure
index 408d454759..0c67a4abd9 100755
--- a/configure
+++ b/configure
@@ -220,14 +220,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"