diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-02 19:30:55 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-25 19:34:48 +0200 |
| commit | 3f889606c7debafacd3da9c9e74caa61b45a13ff (patch) | |
| tree | 2bc4821baebd6e50bfd2999d034328d60c596ff2 /mesonbuild/dependencies/dev.py | |
| parent | 0f237b8d1d84e4906c758bbef44d81e93207f8e4 (diff) | |
| download | meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.zip meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.tar.gz meson-3f889606c7debafacd3da9c9e74caa61b45a13ff.tar.bz2 | |
Split compiler detection from Environment
This moves all the compiler detection logic into the new
compilers.detect module. This dramatically reduces the size
and complexity of Environment.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 60c4b74..0ab8332 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -23,7 +23,7 @@ import shutil import typing as T from .. import mesonlib, mlog -from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler +from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler, detect_compiler_for from ..environment import get_llvm_tool_names from ..mesonlib import version_compare, stringlistify, extract_as_list, MachineChoice from .base import DependencyException, DependencyMethods, strip_system_libdirs, SystemDependency @@ -520,7 +520,7 @@ class JDKSystemDependency(SystemDependency): m = self.env.machines[self.for_machine] if 'java' not in environment.coredata.compilers[self.for_machine]: - environment.detect_compiler_for('java', self.for_machine) + detect_compiler_for(environment, 'java', self.for_machine) self.javac = environment.coredata.compilers[self.for_machine]['java'] self.version = self.javac.version |