diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-07-12 20:57:04 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-07-17 18:37:51 +0300 |
| commit | 61c742fae9ec74e81b3bb3caf815cf49992fb93c (patch) | |
| tree | 18b604a698220c713cba3b443c279c7a65f4f6dc /mesonbuild/compilers/compilers.py | |
| parent | de8e3d65e06f91f0927e84dbf215a298b73590b8 (diff) | |
| download | meson-61c742fae9ec74e81b3bb3caf815cf49992fb93c.tar.gz | |
Remove language (AKA compiler) type from OptionKey.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 247d7e1c0..7057fc2a2 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1355,7 +1355,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): raise EnvironmentException(f'{self.get_id()} does not support preprocessor') def form_compileropt_key(self, basename: str) -> OptionKey: - return OptionKey(basename, machine=self.for_machine, lang=self.language) + return OptionKey(f'{self.language}_{basename}', machine=self.for_machine) def get_global_options(lang: str, comp: T.Type[Compiler], @@ -1363,9 +1363,9 @@ def get_global_options(lang: str, env: 'Environment') -> 'dict[OptionKey, options.UserOption[Any]]': """Retrieve options that apply to all compilers for a given language.""" description = f'Extra arguments passed to the {lang}' - argkey = OptionKey('args', lang=lang, machine=for_machine) - largkey = argkey.evolve('link_args') - envkey = argkey.evolve('env_args') + argkey = OptionKey(f'{lang}_args', machine=for_machine) + largkey = argkey.evolve(f'{lang}_link_args') + envkey = argkey.evolve(f'{lang}_env_args') comp_key = argkey if argkey in env.options else envkey |