diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-03-12 11:02:07 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-04-08 10:00:16 -0700 |
| commit | 390ea4624c2fbfecf831f1c7f34ec796ff410de7 (patch) | |
| tree | 347a332c2730d923550ad590d271a6af1f0027d3 /mesonbuild/compilers/mixins | |
| parent | 00864ca481c4e29d7f5c648a1e12b934dfa642d2 (diff) | |
| download | meson-390ea4624c2fbfecf831f1c7f34ec796ff410de7.tar.gz | |
coredata: move MutableKeyedOptionDict to options
Diffstat (limited to 'mesonbuild/compilers/mixins')
| -rw-r--r-- | mesonbuild/compilers/mixins/clang.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/emscripten.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/gnu.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py index 867b58680..ae5ab631b 100644 --- a/mesonbuild/compilers/mixins/clang.py +++ b/mesonbuild/compilers/mixins/clang.py @@ -18,7 +18,7 @@ from ..compilers import CompileCheckMode from .gnu import GnuLikeCompiler if T.TYPE_CHECKING: - from ...coredata import MutableKeyedOptionDictType + from ...options import MutableKeyedOptionDictType from ...environment import Environment from ...dependencies import Dependency # noqa: F401 from ..compilers import Compiler diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py index c5b2e6dac..91b25e8f7 100644 --- a/mesonbuild/compilers/mixins/emscripten.py +++ b/mesonbuild/compilers/mixins/emscripten.py @@ -15,7 +15,6 @@ from ...mesonlib import LibType from mesonbuild.compilers.compilers import CompileCheckMode if T.TYPE_CHECKING: - from ... import coredata from ...environment import Environment from ...compilers.compilers import Compiler from ...dependencies import Dependency @@ -57,7 +56,7 @@ class EmscriptenMixin(Compiler): args.append(f'-sPTHREAD_POOL_SIZE={count}') return args - def get_options(self) -> coredata.MutableKeyedOptionDictType: + def get_options(self) -> options.MutableKeyedOptionDictType: opts = super().get_options() key = OptionKey(f'{self.language}_thread_count', machine=self.for_machine) diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py index 70fd9ee7d..9ea591e04 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright 2019-2022 The meson development team -# Copyright © 2023 Intel Corporation +# Copyright © 2023-2025 Intel Corporation from __future__ import annotations @@ -21,7 +21,7 @@ from mesonbuild.compilers.compilers import CompileCheckMode if T.TYPE_CHECKING: from ..._typing import ImmutableListProtocol - from ...coredata import MutableKeyedOptionDictType + from ...options import MutableKeyedOptionDictType from ...environment import Environment from ..compilers import Compiler else: |