Skip to content

Commit 14b7632

Browse files
bonzinieli-schwartz
authored andcommitted
rewriter: accept UnknownValue for name_prefix/name_suffix
Fixes another problem with running "meson configure" on Mesa. Related: #14840 Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 314dc6d commit 14b7632

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

mesonbuild/build.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,9 @@ def process_kwargs(self, kwargs):
12251225
self.resources = resources
12261226
if kwargs.get('name_prefix') is not None:
12271227
name_prefix = kwargs['name_prefix']
1228-
if isinstance(name_prefix, list):
1228+
if isinstance(name_prefix, UnknownValue):
1229+
pass
1230+
elif isinstance(name_prefix, list):
12291231
if name_prefix:
12301232
raise InvalidArguments('name_prefix array must be empty to signify default.')
12311233
else:
@@ -1235,7 +1237,9 @@ def process_kwargs(self, kwargs):
12351237
self.name_prefix_set = True
12361238
if kwargs.get('name_suffix') is not None:
12371239
name_suffix = kwargs['name_suffix']
1238-
if isinstance(name_suffix, list):
1240+
if isinstance(name_suffix, UnknownValue):
1241+
pass
1242+
elif isinstance(name_suffix, list):
12391243
if name_suffix:
12401244
raise InvalidArguments('name_suffix array must be empty to signify default.')
12411245
else:

test cases/unit/58 introspect buildoptions/meson.build

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,13 @@ if r.returncode() != 0
1414
error('FAILED')
1515
endif
1616

17+
name_prefix = 'lib'
18+
if get_option('buildtype') == 'release'
19+
# ensure that these variables become an UnkownValue
20+
name_prefix = []
21+
endif
22+
23+
static_library('hello', 'hello.c', name_prefix: name_prefix)
24+
1725
add_languages(r.stdout().strip(), required: true)
1826
add_languages('afgggergearvearghergervergreaergaergasv', required: false)

0 commit comments

Comments
 (0)