diff options
Diffstat (limited to 'mesonbuild/compilers/cython.py')
| -rw-r--r-- | mesonbuild/compilers/cython.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mesonbuild/compilers/cython.py b/mesonbuild/compilers/cython.py index 61e339b..76e66c0 100644 --- a/mesonbuild/compilers/cython.py +++ b/mesonbuild/compilers/cython.py @@ -7,7 +7,7 @@ from __future__ import annotations import typing as T from .. import options -from ..mesonlib import EnvironmentException, OptionKey, version_compare +from ..mesonlib import EnvironmentException, version_compare from .compilers import Compiler if T.TYPE_CHECKING: @@ -70,12 +70,12 @@ class CythonCompiler(Compiler): return self.update_options( super().get_options(), self.create_option(options.UserComboOption, - OptionKey('version', machine=self.for_machine, lang=self.language), + self.form_langopt_key('version'), 'Python version to target', ['2', '3'], '3'), self.create_option(options.UserComboOption, - OptionKey('language', machine=self.for_machine, lang=self.language), + self.form_langopt_key('language'), 'Output C or C++ files', ['c', 'cpp'], 'c'), @@ -83,9 +83,11 @@ class CythonCompiler(Compiler): def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]: args: T.List[str] = [] - key = options[OptionKey('version', machine=self.for_machine, lang=self.language)] - args.append(f'-{key.value}') - lang = options[OptionKey('language', machine=self.for_machine, lang=self.language)] + key = self.form_langopt_key('version') + version = options[key] + args.append(f'-{version.value}') + key = self.form_langopt_key('language') + lang = options[key] if lang.value == 'cpp': args.append('--cplus') return args |