aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-09-11 23:03:43 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-09-19 15:19:00 -0400
commitcc5ef6478ffe871eda6ad90f21d8e9d05613101d (patch)
tree98d5799aeaf2bd5a4bdea0b71d14df06522b62c9 /mesonbuild/dependencies
parentf6f876481f84867ba4150967c8966dcc29df6358 (diff)
downloadmeson-cc5ef6478ffe871eda6ad90f21d8e9d05613101d.zip
meson-cc5ef6478ffe871eda6ad90f21d8e9d05613101d.tar.gz
meson-cc5ef6478ffe871eda6ad90f21d8e9d05613101d.tar.bz2
compilers: perform targeted imports for detect
Only import the ones we need for the language we are detecting, once we actually detect that language. This will allow finally dropping the main imports of these files in a followup commit.
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/dev.py4
-rw-r--r--mesonbuild/dependencies/dub.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index bf9ba2b..e3774c1 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -27,8 +27,6 @@ import typing as T
from mesonbuild.interpreterbase.decorators import FeatureDeprecated
from .. import mesonlib, mlog
-from ..compilers.c import AppleClangCCompiler
-from ..compilers.cpp import AppleClangCPPCompiler
from ..compilers.detect import detect_compiler_for
from ..environment import get_llvm_tool_names
from ..mesonlib import version_compare, stringlistify, extract_as_list
@@ -486,6 +484,8 @@ class ZlibSystemDependency(SystemDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__(name, environment, kwargs)
+ from ..compilers.c import AppleClangCCompiler
+ from ..compilers.cpp import AppleClangCPPCompiler
m = self.env.machines[self.for_machine]
diff --git a/mesonbuild/dependencies/dub.py b/mesonbuild/dependencies/dub.py
index cad4aad..8821e2c 100644
--- a/mesonbuild/dependencies/dub.py
+++ b/mesonbuild/dependencies/dub.py
@@ -17,7 +17,6 @@ from .pkgconfig import PkgConfigDependency
from ..mesonlib import (Popen_safe, OptionKey)
from ..mesonlib.universal import join_args
from ..programs import ExternalProgram
-from ..compilers.d import DCompiler, d_feature_args
from .. import mlog
import re
import os
@@ -33,6 +32,7 @@ class DubDependency(ExternalDependency):
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
super().__init__(DependencyTypeName('dub'), environment, kwargs, language='d')
self.name = name
+ from ..compilers.d import DCompiler, d_feature_args
_temp_comp = super().get_compiler()
assert isinstance(_temp_comp, DCompiler)