diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-09 11:33:06 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-01-29 09:11:24 -0800 |
| commit | fbad73c939a3c7f7f27994a81d68f4a9082c06a0 (patch) | |
| tree | 3e568c07a44961b5cbfa70e49859d841ba882533 /mesonbuild/modules/pkgconfig.py | |
| parent | 5d630c663c125b1e62cb88bd01054f1253c92bbe (diff) | |
| download | meson-fbad73c939a3c7f7f27994a81d68f4a9082c06a0.zip meson-fbad73c939a3c7f7f27994a81d68f4a9082c06a0.tar.gz meson-fbad73c939a3c7f7f27994a81d68f4a9082c06a0.tar.bz2 | |
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
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 6 |
1 files changed, 2 insertions, 4 deletions
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() |