diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-11 14:09:56 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-11 11:15:06 -0800 |
| commit | a2055ad18bba5704c9cbbe211ed4e46549be05f8 (patch) | |
| tree | 6ac78596432668f4f71f9e5cf4dfdab035253f7b | |
| parent | 9f343212e071cfee99e0be76de0f61bec9a6d5f2 (diff) | |
| download | meson-a2055ad18bba5704c9cbbe211ed4e46549be05f8.zip meson-a2055ad18bba5704c9cbbe211ed4e46549be05f8.tar.gz meson-a2055ad18bba5704c9cbbe211ed4e46549be05f8.tar.bz2 | |
import MachineChoice from mesonlib
there are a couple of places importing it from envconfig, which is not
correct. It's defined in mesonlib, and then imported into envconfig.
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 2 | ||||
| -rw-r--r-- | mesonbuild/linkers.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index 21f4e71..ad28975 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -30,8 +30,8 @@ import typing as T if T.TYPE_CHECKING: from .base import Dependency - from ..envconfig import MachineChoice from ..environment import Environment + from ..mesonlib import MachineChoice class HDF5PkgConfigDependency(PkgConfigDependency): diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 141c8fd..8dae94c 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -22,8 +22,8 @@ from .envconfig import get_env_var if T.TYPE_CHECKING: from .coredata import KeyedOptionDictType - from .envconfig import MachineChoice from .environment import Environment + from .mesonlib import MachineChoice class StaticLinker: |