[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/33] build: clean up ninja invocation
From: |
Alex Bennée |
Subject: |
[PULL 13/33] build: clean up ninja invocation |
Date: |
Wed, 1 Jun 2022 19:05:17 +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>
Message-Id: <20220527153603.887929-14-alex.bennee@linaro.org>
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
- [PULL 00/33] testing updates (gitlab, junit, lcitool, x-compile), Alex Bennée, 2022/06/01
- [PULL 04/33] meson.build: fix summary display of test compilers, Alex Bennée, 2022/06/01
- [PULL 06/33] tests/docker: update debian-armhf-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 02/33] .gitlab-ci.d/crossbuilds: Fix the dependency of the cross-i386-tci job, Alex Bennée, 2022/06/01
- [PULL 01/33] .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages, Alex Bennée, 2022/06/01
- [PULL 03/33] gitlab-ci: add meson JUnit test result into report, Alex Bennée, 2022/06/01
- [PULL 10/33] tests/docker: update debian-ppc64el-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 07/33] tests/docker: update debian-armel-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 05/33] tests/lcitool: fix up indentation to correct style, Alex Bennée, 2022/06/01
- [PULL 09/33] tests/docker: update debian-mips64el-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 13/33] build: clean up ninja invocation,
Alex Bennée <=
- [PULL 08/33] tests/docker: update debian-mipsel-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 12/33] configure: do not define or use the CPP variable, Alex Bennée, 2022/06/01
- [PULL 16/33] configure, meson: move symlinking of ROMs to meson, Alex Bennée, 2022/06/01
- [PULL 21/33] configure: introduce --cross-prefix-*=, Alex Bennée, 2022/06/01
- [PULL 11/33] tests/docker: update debian-amd64 with lcitool, Alex Bennée, 2022/06/01
- [PULL 25/33] configure: enable cross-compilation of optionrom, Alex Bennée, 2022/06/01
- [PULL 14/33] build: add a more generic way to specify make->ninja dependencies, Alex Bennée, 2022/06/01
- [PULL 28/33] gitlab: introduce a common base job template, Alex Bennée, 2022/06/01
- [PULL 24/33] configure: enable cross-compilation of s390-ccw, Alex Bennée, 2022/06/01
- [PULL 18/33] tests/tcg: merge configure.sh back into main configure script, Alex Bennée, 2022/06/01