diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index e636d258e8..9e3a75c8b1 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -53,6 +53,11 @@ "werror", } +# Options that configure prints help for, so we can skip +CONFIGURE_HELP = { + "gdb", +} + # Builtin options that should be definable via configure. Some of the others # we really do not want (e.g. c_args is defined via the native file, not # via -D, because it's a mix of CFLAGS and --extra-cflags); for specific @@ -189,7 +194,9 @@ def print_help(options): key = cli_help_key(opt) # The first section includes options that have an arguments, # and booleans (i.e., only one of enable/disable makes sense) - if require_arg(opt): + if opt["name"] in CONFIGURE_HELP: + pass + elif require_arg(opt): metavar = cli_metavar(opt) left = f"--{key}={metavar}" help_line(left, opt, 27, True) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3d0d132344..e8edc5252a 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' --enable-ubsan enable undefined behaviour sanitizer' printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' printf "%s\n" ' firmware]' - printf "%s\n" ' --gdb=VALUE Path to GDB' printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=VALUE Header file directory [include]' printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for'