From fbad73c939a3c7f7f27994a81d68f4a9082c06a0 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 9 Jan 2020 11:33:06 -0800 Subject: dependencies: Use a DependencyFactory for threads This lets us make a number of uses of threads safer, because we can use the threads_factory instead of the ThreadDependency --- mesonbuild/modules/pkgconfig.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mesonbuild/modules/pkgconfig.py') diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index dc45a5b..2341bd2 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -17,6 +17,7 @@ from pathlib import PurePath from .. import build from .. import dependencies +from ..dependencies.misc import ThreadDependency from .. import mesonlib from .. import mlog from . import ModuleReturnValue @@ -94,7 +95,7 @@ class DependenciesHelper: self.add_version_reqs(name, version_req) elif isinstance(obj, dependencies.Dependency) and not obj.found(): pass - elif isinstance(obj, dependencies.ThreadDependency): + elif isinstance(obj, ThreadDependency): pass else: raise mesonlib.MesonException('requires argument not a string, ' @@ -125,9 +126,6 @@ class DependenciesHelper: if obj.found(): processed_reqs.append(obj.name) self.add_version_reqs(obj.name, obj.version_reqs) - elif isinstance(obj, dependencies.ThreadDependency): - processed_libs += obj.get_compiler().thread_link_flags(obj.env) - processed_cflags += obj.get_compiler().thread_flags(obj.env) elif isinstance(obj, dependencies.InternalDependency): if obj.found(): processed_libs += obj.get_link_args() -- cgit v1.1