| Message ID | 160459121308.462591.11794514422987547665.stgit@bahia.lan |
|---|---|
| State | New |
| Headers | show |
| Series | [for-5.2?,1/2] Makefile: Don't use $(quiet-@) within the body of a recipe | expand |
On 11/5/20 4:47 PM, Greg Kurz wrote: > It doesn't bring much to have echoing with "make help". Suppress it > unconditionally. > > Signed-off-by: Greg Kurz <groug@kaod.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) 'make help' is not as helpful as it used to be. Still: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 05/11/20 16:47, Greg Kurz wrote: > It doesn't bring much to have echoing with "make help". Suppress it > unconditionally. > > Signed-off-by: Greg Kurz <groug@kaod.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index df7a02a61a43..ba6b702107a5 100644 > --- a/Makefile > +++ b/Makefile > @@ -270,7 +270,7 @@ include $(SRC_PATH)/tests/docker/Makefile.include > include $(SRC_PATH)/tests/vm/Makefile.include > > print-help-run = printf " %-30s - %s\\n" "$1" "$2" > -print-help = $(quiet-@)$(call print-help-run,$1,$2) > +print-help = @$(call print-help-run,$1,$2) > > .PHONY: help > help: > > Queued, thanks (the first was already in my tree). Paolo
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
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(-)