aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-06-08 22:21:48 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-06-09 09:46:37 +0200
commit9c40b33cf6a0425a8452fa34dc7b4101e29d0319 (patch)
treec20899a3315bd971fbcb5dcde48c89316566d78c /mesonbuild/dependencies
parent2263a84d0796ffe93c3dc33502dc13412fbd4afe (diff)
downloadmeson-9c40b33cf6a0425a8452fa34dc7b4101e29d0319.zip
meson-9c40b33cf6a0425a8452fa34dc7b4101e29d0319.tar.gz
meson-9c40b33cf6a0425a8452fa34dc7b4101e29d0319.tar.bz2
compilers: Fix missing functions in Compiler base class
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/cuda.py2
-rw-r--r--mesonbuild/dependencies/dev.py3
-rw-r--r--mesonbuild/dependencies/framework.py4
-rw-r--r--mesonbuild/dependencies/misc.py2
-rw-r--r--mesonbuild/dependencies/platform.py2
5 files changed, 2 insertions, 11 deletions
diff --git a/mesonbuild/dependencies/cuda.py b/mesonbuild/dependencies/cuda.py
index bea4793..42fdb09 100644
--- a/mesonbuild/dependencies/cuda.py
+++ b/mesonbuild/dependencies/cuda.py
@@ -285,8 +285,6 @@ class CudaDependency(ExternalDependency):
def get_link_args(self, language: T.Optional[str] = None, raw: bool = False) -> T.List[str]:
args = []
if self.libdir:
- from ..compilers import CLikeCompiler
- assert isinstance(self.clib_compiler, CLikeCompiler)
args += self.clib_compiler.get_linker_search_args(self.libdir)
for lib in self.requested_modules:
args += self.lib_modules[lib]
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 9c1d932..397ad0c 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -31,7 +31,7 @@ from .configtool import ConfigToolDependency
from .pkgconfig import PkgConfigDependency
from .factory import DependencyFactory
from .misc import threads_factory
-from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler, CLikeCompiler
+from ..compilers import AppleClangCCompiler, AppleClangCPPCompiler
if T.TYPE_CHECKING:
from ..envconfig import MachineInfo
@@ -261,7 +261,6 @@ class LLVMDependencyConfigTool(ConfigToolDependency):
new_args.append(arg.lstrip('-l'))
elif arg.startswith('-LIBPATH:'):
cpp = self.env.coredata.compilers[self.for_machine]['cpp']
- assert isinstance(cpp, CLikeCompiler)
new_args.extend(cpp.get_linker_search_args(arg.lstrip('-LIBPATH:')))
else:
new_args.append(arg)
diff --git a/mesonbuild/dependencies/framework.py b/mesonbuild/dependencies/framework.py
index 152c14e..2ef33c8 100644
--- a/mesonbuild/dependencies/framework.py
+++ b/mesonbuild/dependencies/framework.py
@@ -14,7 +14,6 @@
from .base import ExternalDependency, DependencyException, DependencyMethods
from ..mesonlib import MesonException, Version, stringlistify
-from ..compilers import CLikeCompiler
from .. import mlog
from pathlib import Path
import typing as T
@@ -31,7 +30,7 @@ class ExtraFrameworkDependency(ExternalDependency):
self.name = name
# Full path to framework directory
self.framework_path: T.Optional[str] = None
- if not isinstance(self.clib_compiler, CLikeCompiler):
+ if not self.clib_compiler:
raise DependencyException('No C-like compilers are available')
if self.system_framework_paths is None:
try:
@@ -64,7 +63,6 @@ class ExtraFrameworkDependency(ExternalDependency):
# Python.framework. We need to know for sure that the framework was
# found in the path we expect.
allow_system = p in self.system_framework_paths
- assert isinstance(self.clib_compiler, CLikeCompiler)
args = self.clib_compiler.find_framework(name, self.env, [p], allow_system)
if args is None:
continue
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 79afb41..1dadb51 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -23,7 +23,6 @@ import typing as T
from .. import mlog
from .. import mesonlib
from ..environment import detect_cpu_family
-from ..compilers import CLikeCompiler
from .base import DependencyException, DependencyMethods, ExternalDependency
from .cmake import CMakeDependency
@@ -300,7 +299,6 @@ class PcapDependencyConfigTool(ConfigToolDependency):
if not self.env.machines.matches_build_machine(self.for_machine):
return None
- assert isinstance(self.clib_compiler, CLikeCompiler)
v = self.clib_compiler.get_return_value('pcap_lib_version', 'string',
'#include <pcap.h>', self.env, [], [self])
v = re.sub(r'libpcap version ', '', str(v))
diff --git a/mesonbuild/dependencies/platform.py b/mesonbuild/dependencies/platform.py
index 8c28539..816e32f 100644
--- a/mesonbuild/dependencies/platform.py
+++ b/mesonbuild/dependencies/platform.py
@@ -17,7 +17,6 @@
from .base import ExternalDependency, DependencyException
from ..mesonlib import MesonException
-from ..compilers import CLikeCompiler
import typing as T
if T.TYPE_CHECKING:
@@ -37,7 +36,6 @@ class AppleFrameworks(ExternalDependency):
self.is_found = True
for f in self.frameworks:
try:
- assert isinstance(self.clib_compiler, CLikeCompiler)
args = self.clib_compiler.find_framework(f, env, [])
except MesonException as e:
if 'non-clang' in str(e):