diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 19:00:57 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 19:00:57 +0200 |
| commit | 0c9c29b6b64a05611dc66ec04747b3970e25ca5c (patch) | |
| tree | 1ebfd2361f3fbc248a0d65e8e8909505b4020e6b | |
| parent | ae1f284ade322f28b2efdf7abaef2543949f31d3 (diff) | |
| download | meson-0c9c29b6b64a05611dc66ec04747b3970e25ca5c.zip meson-0c9c29b6b64a05611dc66ec04747b3970e25ca5c.tar.gz meson-0c9c29b6b64a05611dc66ec04747b3970e25ca5c.tar.bz2 | |
Preserve b_ prefix for base option names.
| -rw-r--r-- | mesonbuild/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/optinterpreter.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 2c35c67..2a9c3ab 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -121,7 +121,7 @@ base_options = {'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time opti 'b_lundef': coredata.UserBooleanOption('b_lundef', 'Use -Wl,--no-undefined when linking', True), 'b_pgo': coredata.UserComboOption('b_pgo', 'Use profile guide optimization', ['off', 'generate', 'use'], - 'off') + 'off'), } def sanitizer_compile_args(value): diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index f0c93ae..95d0472 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -13,7 +13,7 @@ # limitations under the License. from . import mparser -from . import coredata, mesonlib +from . import coredata import os, re forbidden_option_names = coredata.builtin_options @@ -24,13 +24,16 @@ forbidden_prefixes = {'c_': True, 'objc_': True, 'objcpp_': True, 'vala_': True, - 'csharp_': True + 'csharp_': True, + 'swift_': True, + 'b_': True, } def is_invalid_name(name): if name in forbidden_option_names: return True - if name in forbidden_prefixes: + pref = name.split('_')[0] + '_' + if pref in forbidden_prefixes: return True return False |