From 14b76321c3f528e95384f7ea5f238ccd1340df3d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 11 Aug 2025 18:33:25 +0200 Subject: rewriter: accept UnknownValue for name_prefix/name_suffix Fixes another problem with running "meson configure" on Mesa. Related: #14840 Signed-off-by: Paolo Bonzini --- mesonbuild/build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 041cb1972..b43532006 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1225,7 +1225,9 @@ class BuildTarget(Target): self.resources = resources if kwargs.get('name_prefix') is not None: name_prefix = kwargs['name_prefix'] - if isinstance(name_prefix, list): + if isinstance(name_prefix, UnknownValue): + pass + elif isinstance(name_prefix, list): if name_prefix: raise InvalidArguments('name_prefix array must be empty to signify default.') else: @@ -1235,7 +1237,9 @@ class BuildTarget(Target): self.name_prefix_set = True if kwargs.get('name_suffix') is not None: name_suffix = kwargs['name_suffix'] - if isinstance(name_suffix, list): + if isinstance(name_suffix, UnknownValue): + pass + elif isinstance(name_suffix, list): if name_suffix: raise InvalidArguments('name_suffix array must be empty to signify default.') else: -- cgit v1.2.3