mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
tests/tcg: reinstate or replace desired parts of rules.mak
Commit 660f793093
was a bit overzealous
with respect to tests/tcg, which needed quiet-command and $(BUILD_DIR).
Reinstate quiet-command, and replace $(BUILD_DIR) with just the
current directory.
Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ff9ed62b90
commit
2c24305306
|
@ -11,9 +11,20 @@
|
|||
# The configure script fills in extra information about
|
||||
# useful docker images or alternative compiler flags.
|
||||
|
||||
# Usage: $(call quiet-command,command and args,"NAME","args to print")
|
||||
# This will run "command and args", and either:
|
||||
# if V=1 just print the whole command and args
|
||||
# otherwise print the 'quiet' output in the format " NAME args to print"
|
||||
# NAME should be a short name of the command, 7 letters or fewer.
|
||||
# If called with only a single argument, will print nothing in quiet mode.
|
||||
quiet-command-run = $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1
|
||||
quiet-@ = $(if $(V),,@)
|
||||
quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3)
|
||||
|
||||
CROSS_CC_GUEST:=
|
||||
DOCKER_IMAGE:=
|
||||
-include $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak
|
||||
|
||||
-include tests/tcg/config-$(TARGET).mak
|
||||
|
||||
GUEST_BUILD=
|
||||
TCG_MAKE=../Makefile.target
|
||||
|
|
|
@ -193,11 +193,11 @@ for target in $target_list; do
|
|||
case $target in
|
||||
*-linux-user | *-bsd-user)
|
||||
echo "CONFIG_USER_ONLY=y" >> $config_target_mak
|
||||
echo "QEMU=\$(BUILD_DIR)/qemu-$arch" >> $config_target_mak
|
||||
echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
|
||||
;;
|
||||
*-softmmu)
|
||||
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
|
||||
echo "QEMU=\$(BUILD_DIR)/qemu-system-$arch" >> $config_target_mak
|
||||
echo "QEMU=$PWD/qemu-system-$arch" >> $config_target_mak
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
Loading…
Reference in a new issue