diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-02 16:02:03 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-04 12:20:39 -0800 |
| commit | fe973d9fc45581f20fefc41fc0b8eb0066c0129d (patch) | |
| tree | cbf7f5bd779ddae1655c9644ef96c4df66e67ee3 /mesonbuild/cmake/interpreter.py | |
| parent | bdca05e2e66abbd872c17b8226641a2b8d018112 (diff) | |
| download | meson-fe973d9fc45581f20fefc41fc0b8eb0066c0129d.zip meson-fe973d9fc45581f20fefc41fc0b8eb0066c0129d.tar.gz meson-fe973d9fc45581f20fefc41fc0b8eb0066c0129d.tar.bz2 | |
use OptionKey for compiler_options
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index d4f7fba..6125f15 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -31,6 +31,7 @@ from pathlib import Path import typing as T import re from os import environ +from ..coredata import OptionKey from ..mparser import ( Token, @@ -577,10 +578,10 @@ class ConverterTarget: @lru_cache(maxsize=None) def _all_lang_stds(self, lang: str) -> T.List[str]: - lang_opts = self.env.coredata.compiler_options.build.get(lang, None) - if not lang_opts or 'std' not in lang_opts: + try: + res = self.env.coredata.compiler_options[OptionKey('std', machine=MachineChoice.BUILD, lang=lang)].choices # type: ignore + except KeyError: return [] - res = lang_opts['std'].choices # TODO: Get rid of this once we have propper typing for options assert isinstance(res, list) |