[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] build: rebuild build.ninja using "meson setup --reconfigure"
From: |
Paolo Bonzini |
Subject: |
[PULL 3/7] build: rebuild build.ninja using "meson setup --reconfigure" |
Date: |
Sat, 20 May 2023 21:06:28 +0200 |
Do not use the rule in build.ninja, because the path to meson is hardcoded
in build.ninja and this breaks if meson moves (for example if the distro
meson suddenly becomes too old after an update).
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 3c7d67142f13..08fb6a3b058a 100644
--- a/Makefile
+++ b/Makefile
@@ -115,15 +115,15 @@ Makefile.ninja: build.ninja
$(NINJA) -t query build.ninja | sed -n '1,/^ input:/d; /^
outputs:/q; s/$$/ \\/p'; \
} > $@.tmp && mv $@.tmp $@
-include Makefile.ninja
+endif
+ifneq ($(MESON),)
# A separate rule is needed for Makefile dependencies to avoid -n
build.ninja: build.ninja.stamp
$(build-files):
build.ninja.stamp: meson.stamp $(build-files)
- $(NINJA) $(if $V,-v,) build.ninja && touch $@
-endif
+ $(MESON) setup --reconfigure $(SRC_PATH) && touch $@
-ifneq ($(MESON),)
Makefile.mtest: build.ninja scripts/mtest2make.py
$(MESON) introspect --targets --tests --benchmarks | $(PYTHON)
scripts/mtest2make.py > $@
-include Makefile.mtest
--
2.40.1
- [PULL 0/7] Python fixes and related patches, Paolo Bonzini, 2023/05/20
- [PULL 1/7] remove remaining traces of meson submodule, Paolo Bonzini, 2023/05/20
- [PULL 2/7] mkvenv: replace distlib.database with importlib.metadata/pkg_resources, Paolo Bonzini, 2023/05/20
- [PULL 3/7] build: rebuild build.ninja using "meson setup --reconfigure",
Paolo Bonzini <=
- [PULL 4/7] configure: fix backwards-compatibility for meson sphinx_build option, Paolo Bonzini, 2023/05/20
- [PULL 5/7] mkvenv: pass first missing package to diagnose(), Paolo Bonzini, 2023/05/20
- [PULL 6/7] gitlab: custom-runners: preserve more artifacts for debugging, Paolo Bonzini, 2023/05/20
- [PULL 7/7] scripts: make sure scripts are invoked via $(PYTHON), Paolo Bonzini, 2023/05/20
- Re: [PULL 0/7] Python fixes and related patches, Richard Henderson, 2023/05/22