From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 8/8] makefile: handle -n / -k / -q correctly
Date: Tue, 27 Oct 2020 09:59:38 +0000 [thread overview]
Message-ID: <20201027095938.28673-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org>
From: Paolo Bonzini <pbonzini@redhat.com>
Use $(findstring) instead of $(filter) to detect -n/-k
as different versions of MAKE fill in $(MAKEFLAGS) differently.
Do not bother running ninja at all if -nq is passed.
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026155854.3074290-1-pbonzini@redhat.com>
diff --git a/Makefile b/Makefile
index 4d1fa8bb3d..e7c1000f5c 100644
--- a/Makefile
+++ b/Makefile
@@ -146,9 +146,12 @@ endif
# 4. Rules to bridge to other makefiles
ifneq ($(NINJA),)
-NINJAFLAGS = $(if $V,-v,) \
+MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS)))
+MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS)))
+MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS)))
+MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
+NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
$(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
- $(subst -k, -k0, $(filter -n -k,$(MAKEFLAGS)))
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
ninja-cmd-goals += $(foreach t, $(.tests), $(.test.deps.$t))
@@ -165,7 +168,8 @@ $(ninja-targets): run-ninja
# --output-sync line.
run-ninja: config-host.mak
ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
- +@$(NINJA) $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat
+ +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) \
+ $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat)
endif
endif
--
2.20.1
next prev parent reply other threads:[~2020-10-27 10:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
2020-10-27 9:59 ` [PULL 1/8] Adding ani's email as an individual contributor Alex Bennée
2020-10-27 9:59 ` [PULL 2/8] contrib/gitdm: Add more individual contributors Alex Bennée
2020-10-27 9:59 ` [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 Alex Bennée
2020-10-27 9:59 ` [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch Alex Bennée
2020-10-27 9:59 ` [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found Alex Bennée
2020-10-27 9:59 ` [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging Alex Bennée
2020-10-27 9:59 ` [PULL 7/8] gitlab-ci: Clone from GitLab itself Alex Bennée
2020-10-27 9:59 ` Alex Bennée [this message]
2020-10-29 10:03 ` [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027095938.28673-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).