[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 13/33] build: clean up ninja invocation
From: |
Alex Bennée |
Subject: |
[PATCH v1 13/33] build: clean up ninja invocation |
Date: |
Fri, 27 May 2022 16:35:43 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Fix an incorrect "@@:" and move "-d keepdepfile" to the NINJAFLAGS variable.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-3-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b842dbccdb..fad312040f 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ MAKE.q = $(findstring q,$(firstword $(filter-out
--%,$(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)))) \
-
+ -d keepdepfile
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps))
@@ -160,8 +160,8 @@ $(ninja-targets): run-ninja
# --output-sync line.
run-ninja: config-host.mak
ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
- +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) -d keepdepfile \
- $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals)))
| cat)
+ +$(if $(MAKE.nq),@:,$(quiet-@)$(NINJA) $(NINJAFLAGS) \
+ $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat)
endif
endif
--
2.30.2
- [PATCH v1 17/33] tests/tcg: correct target CPU for sparc32, (continued)
- [PATCH v1 17/33] tests/tcg: correct target CPU for sparc32, Alex Bennée, 2022/05/27
- [PATCH v1 29/33] gitlab: convert Cirrus jobs to .base_job_template, Alex Bennée, 2022/05/27
- [PATCH v1 15/33] build: do a full build before running TCG tests, Alex Bennée, 2022/05/27
- [PATCH v1 27/33] configure: remove unused variables from config-host.mak, Alex Bennée, 2022/05/27
- [PATCH v1 20/33] configure: handle host compiler in probe_target_compiler, Alex Bennée, 2022/05/27
- [PATCH v1 23/33] configure: move symlink configuration earlier, Alex Bennée, 2022/05/27
- [PATCH v1 25/33] configure: enable cross-compilation of optionrom, Alex Bennée, 2022/05/27
- [PATCH v1 13/33] build: clean up ninja invocation,
Alex Bennée <=
- [PATCH v1 11/33] tests/docker: update debian-amd64 with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 33/33] docs/devel: clean-up the CI links in the docs, Alex Bennée, 2022/05/27
- [PATCH v1 24/33] configure: enable cross-compilation of s390-ccw, Alex Bennée, 2022/05/27
- [PATCH v1 16/33] configure, meson: move symlinking of ROMs to meson, Alex Bennée, 2022/05/27
- [PATCH v1 28/33] gitlab: introduce a common base job template, Alex Bennée, 2022/05/27
- [PATCH v1 22/33] configure: include more binutils in tests/tcg makefile, Alex Bennée, 2022/05/27