diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-12 19:40:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-12 19:40:08 +0300 |
commit | f695359e1d487deaada8db61694cc24f10985580 (patch) | |
tree | 24945e551de3e9090f32c366f5b0f667d9b233c2 /mesonbuild/build.py | |
parent | fa1bb2a67649ee730387a6b3a4f030933b4573fb (diff) | |
parent | ba7b50a1045e6a57710137dd856e031ca5e96566 (diff) | |
download | meson-f695359e1d487deaada8db61694cc24f10985580.zip meson-f695359e1d487deaada8db61694cc24f10985580.tar.gz meson-f695359e1d487deaada8db61694cc24f10985580.tar.bz2 |
Merge pull request #6958 from jon-turney/fix-name-prefix-explicit-default
Fix library(name_prefix: [])
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 616a183..b1bf9d4 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -922,16 +922,17 @@ This will become a hard error in a future Meson release.''') name_prefix = kwargs['name_prefix'] if isinstance(name_prefix, list): if name_prefix: - raise InvalidArguments('name_prefix array must be empty to signify null.') - elif not isinstance(name_prefix, str): - raise InvalidArguments('name_prefix must be a string.') - self.prefix = name_prefix - self.name_prefix_set = True + raise InvalidArguments('name_prefix array must be empty to signify default.') + else: + if not isinstance(name_prefix, str): + raise InvalidArguments('name_prefix must be a string.') + self.prefix = name_prefix + self.name_prefix_set = True if 'name_suffix' in kwargs: name_suffix = kwargs['name_suffix'] if isinstance(name_suffix, list): if name_suffix: - raise InvalidArguments('name_suffix array must be empty to signify null.') + raise InvalidArguments('name_suffix array must be empty to signify default.') else: if not isinstance(name_suffix, str): raise InvalidArguments('name_suffix must be a string.') |