diff options
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 620e0d2..f59eb87 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -27,6 +27,9 @@ from .mesonlib import ( PerMachineDefaultable, PerThreeMachineDefaultable, split_args, quote_arg, OptionKey ) from . import mlog +from .programs import ( + ExternalProgram, EmptyExternalProgram +) from .envconfig import ( BinaryTable, MachineInfo, Properties, known_cpu_families, CMakeVariables, @@ -208,7 +211,6 @@ def detect_ninja(version: str = '1.8.2', log: bool = False) -> T.List[str]: return r[0] if r else None def detect_ninja_command_and_version(version: str = '1.8.2', log: bool = False) -> (T.List[str], str): - from .dependencies.base import ExternalProgram env_ninja = os.environ.get('NINJA', None) for n in [env_ninja] if env_ninja else ['ninja', 'ninja-build', 'samu']: prog = ExternalProgram(n, silent=True) @@ -694,7 +696,6 @@ class Environment: exe_wrapper = self.lookup_binary_entry(MachineChoice.HOST, 'exe_wrapper') if exe_wrapper is not None: - from .dependencies import ExternalProgram self.exe_wrapper = ExternalProgram.from_bin_list(self, MachineChoice.HOST, 'exe_wrapper') else: self.exe_wrapper = None @@ -2157,6 +2158,5 @@ class Environment: def get_exe_wrapper(self): if not self.need_exe_wrapper(): - from .dependencies import EmptyExternalProgram return EmptyExternalProgram() return self.exe_wrapper |