diff options
author | Laurin-Luis Lehning <65224843+e820@users.noreply.github.com> | 2021-06-17 21:02:51 +0200 |
---|---|---|
committer | Laurin-Luis Lehning <65224843+e820@users.noreply.github.com> | 2021-06-21 09:15:13 +0200 |
commit | c9ad98ef5ef8dd1931735f07015bf8ad199cd456 (patch) | |
tree | 1ab6dc7bb0e2f8c1ef43f60129f3b35039544d76 /mesonbuild/interpreter/interpreter.py | |
parent | 2e8729a7e6cee460f8e75e231ecdd01933fbd277 (diff) | |
download | meson-c9ad98ef5ef8dd1931735f07015bf8ad199cd456.zip meson-c9ad98ef5ef8dd1931735f07015bf8ad199cd456.tar.gz meson-c9ad98ef5ef8dd1931735f07015bf8ad199cd456.tar.bz2 |
interprter: Add required kwarg to add_(project|global)_arguments
To avoid manual compiler support checks add_project_arguments and
add_global_arguments receive a new keyword argument to perform
them automatically.
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter/interpreter.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index be17c9a..6679aaf 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2321,8 +2321,9 @@ This will become a hard error in the future.''' % kwargs['input'], location=self self.build.test_setups[setup_name] = build.TestSetup(exe_wrapper, gdb, timeout_multiplier, env, exclude_suites) + @FeatureNewKwargs('add_global_arguments', '0.59.0', ['required']) @typed_pos_args('add_global_arguments', varargs=str) - @typed_kwargs('add_global_arguments', _NATIVE_KW, _LANGUAGE_KW) + @typed_kwargs('add_global_arguments', _NATIVE_KW, _LANGUAGE_KW, KwargInfo('required', bool, default=False)) def func_add_global_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs: 'kwargs.FuncAddProjectArgs') -> None: self._add_global_arguments(node, self.build.global_args[kwargs['native']], args[0], kwargs) @@ -2331,8 +2332,9 @@ This will become a hard error in the future.''' % kwargs['input'], location=self def func_add_global_link_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs: 'kwargs.FuncAddProjectArgs') -> None: self._add_global_arguments(node, self.build.global_link_args[kwargs['native']], args[0], kwargs) + @FeatureNewKwargs('add_project_arguments', '0.59.0', ['required']) @typed_pos_args('add_project_arguments', varargs=str) - @typed_kwargs('add_global_arguments', _NATIVE_KW, _LANGUAGE_KW) + @typed_kwargs('add_project_arguments', _NATIVE_KW, _LANGUAGE_KW, KwargInfo('required', bool, default=False)) def func_add_project_arguments(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs: 'kwargs.FuncAddProjectArgs') -> None: self._add_project_arguments(node, self.build.projects_args[kwargs['native']], args[0], kwargs) @@ -2398,6 +2400,18 @@ This will become a hard error in the future.''' % kwargs['input'], location=self self._warn_about_builtin_args(args) + try: + if kwargs['required']: + compilers = self.coredata.compilers.build.values() if kwargs['native'] \ + else self.coredata.compilers.host.values() + + for c in compilers: + for arg in args: + if not c.has_multi_arguments([arg], self.environment)[0]: + raise mesonlib.MesonException(f'C compiler does not support "{arg}"') + except KeyError: + pass + for lang in kwargs['language']: argsdict[lang] = argsdict.get(lang, []) + args |