diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 22:04:24 +0200 |
| commit | d87eb7d2905eaa9ed7bac60945821c7b039298d8 (patch) | |
| tree | 65dd79f54b021f800f258410aca28bb151e0aa48 /mesonbuild/optinterpreter.py | |
| parent | 9071c8fc454f5f56060bb979fa3ea01cc61e6ffb (diff) | |
| parent | a405f7a4994d7823b0e4429438e78a6b3dadecdc (diff) | |
| download | meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.zip meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.gz meson-d87eb7d2905eaa9ed7bac60945821c7b039298d8.tar.bz2 | |
Merge branch 'base_options'.
Diffstat (limited to 'mesonbuild/optinterpreter.py')
| -rw-r--r-- | mesonbuild/optinterpreter.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 30a26ab..e2f7ca5 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 |