On 2/4/25 21:10, Joel Granados wrote:
Replace the meson introspect argument with the build directory instead
of the meson.build file. The introspect command accepts an optional
build directory not a file.
Signed-off-by: Joel Granados <joel.grana...@kernel.org>
---
For some reason this causes an error when I "remote" compile qemu.
In any case, the introspect only accepts directories, so having it point
the to the meson.build file is a mistake.
Unfortunately, the help for "meson introspect" doesn't tell the whole
story... Instead, https://mesonbuild.com/IDE-integration.html under
"Build options" says:
Since Meson 0.50.0 it is also possible to get the default
buildoptions without a build directory by providing the root
meson.build instead of a build directory to meson introspect
--buildoptions.
Running --buildoptions without a build directory produces the same
output as running it with a freshly configured build directory.
The idea here is to make it possible to update the meson-buildoptions.sh
script even in case the build directory if somehow hosed. So I'd rather
avoid this patch if possible.
What's the error that you have and do you have a reproducer?
Paolo
Comments are greatly appreciated
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b65b0bd41a..da88d9bb31 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ Makefile.mtest: build.ninja scripts/mtest2make.py
.PHONY: update-buildoptions
all update-buildoptions: $(SRC_PATH)/scripts/meson-buildoptions.sh
$(SRC_PATH)/scripts/meson-buildoptions.sh: $(SRC_PATH)/meson_options.txt
- $(MESON) introspect --buildoptions $(SRC_PATH)/meson.build | $(PYTHON) \
+ $(MESON) introspect --buildoptions $(BUILD_DIR) | $(PYTHON) \
scripts/meson-buildoptions.py > $@.tmp && mv $@.tmp $@
endif
---
base-commit: d922088eb4ba6bc31a99f17b32cf75e59dd306cd
change-id: 20250204-jag-fix_meson-43db4d290315
Best regards,
