qemu-trivial
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH for-5.2? 1/2] Makefile: Don't use $(quiet-@) within the body of a


From: Greg Kurz
Subject: [PATCH for-5.2? 1/2] Makefile: Don't use $(quiet-@) within the body of a recipe
Date: Thu, 05 Nov 2020 16:46:53 +0100
User-agent: StGit/0.21

A weird message is printed when doing 'make clean' or 'make distclean':

./configure && make clean
...
bash: @/usr/bin/ninja: No such file or directory

and ninja doesn't get called in this case.

It doesn't make sense to use $(quiet-@) within the body of a recipe.
Since both recipes are already prefixed by @ anyway, just drop the
$(quiet-@) invocations.

Fixes: 09e93326e448 ("build: replace ninjatool with ninja")
Cc: pbonzini@redhat.com
Signed-off-by: Greg Kurz <groug@kaod.org>
---
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9465720696e6..df7a02a61a43 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
 ######################################################################
 
 clean: recurse-clean
-       -@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean || :
+       -@test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || :
        -@test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || :
 # avoid old build problems by removing potentially incorrect old files
        rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h 
gen-op-arm.h
@@ -231,7 +231,7 @@ qemu-%.tar.bz2:
        $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst 
qemu-%.tar.bz2,%,$@)"
 
 distclean: clean
-       -@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean -g 
|| :
+       -@test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
        rm -f config-host.mak config-host.h*
        rm -f tests/tcg/config-*.mak
        rm -f config-all-disas.mak config.status





reply via email to

[Prev in Thread] Current Thread [Next in Thread]