summary refs log tree commit diff stats
path: root/scripts/meson-buildoptions.py
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-10-16 08:20:13 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-10-18 10:01:02 +0200
commit090a188cc1a85b8b5e33ad164c923003935323cc (patch)
tree578762ecdee5778595539b5ca2e96a1862a2e752 /scripts/meson-buildoptions.py
parentc36dd41ba2a8bd8d51f4f7499fbdc02b1bd5c865 (diff)
downloadfocaccia-qemu-090a188cc1a85b8b5e33ad164c923003935323cc.tar.gz
focaccia-qemu-090a188cc1a85b8b5e33ad164c923003935323cc.zip
configure: move environment-specific defaults to config-meson.cross
Store the -Werror and SMBD defaults in the machine file, which still allows
them to be overridden on the command line and enables automatic parsing
of the related options.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/meson-buildoptions.py')
-rw-r--r--scripts/meson-buildoptions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 0c24bdc1e8..2e88732a29 100644
--- a/scripts/meson-buildoptions.py
+++ b/scripts/meson-buildoptions.py
@@ -28,7 +28,6 @@ import sys
 SKIP_OPTIONS = {
     "default_devices",
     "fuzzing_engine",
-    "smbd",
 }
 
 OPTION_NAMES = {
@@ -47,6 +46,7 @@ OPTION_NAMES = {
 # Options that configure autodetects, even though meson defines them as boolean
 AUTO_OPTIONS = {
     "plugins",
+    "werror",
 }
 
 BUILTIN_OPTIONS = {
@@ -64,6 +64,7 @@ BUILTIN_OPTIONS = {
     "prefix",
     "strip",
     "sysconfdir",
+    "werror",
 }
 
 LINE_WIDTH = 76