From c54b59ee0da90dfb169c05e43ebf0c01a7dd5215 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 20 Apr 2022 17:33:58 +0200 Subject: meson: pass more options directly as -D MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If an option is not used anywhere by the configure script, it can be just added to $meson_options even if it is not parsed by the automatically generated bits in scripts/meson-buildoptions.sh. The only slightly tricky case is $debug, where the if test "$fortify_source" = "yes" ; then QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" debug=no fi assignment is dead; configure sets fortify_source=no whenever debug=yes. Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/meson-buildoptions.py') diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 45cda8cd84..e624c16b01 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -33,6 +33,8 @@ SKIP_OPTIONS = { } OPTION_NAMES = { + "b_coverage": "gcov", + "b_lto": "lto", "malloc": "enable-malloc", "pkgversion": "with-pkgversion", "qemu_firmwarepath": "firmwarepath", @@ -41,6 +43,8 @@ OPTION_NAMES = { } BUILTIN_OPTIONS = { + "b_coverage", + "b_lto", "datadir", "includedir", "libdir", -- cgit v1.2.3