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/dependencies/boost.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/dependencies/boost.py') diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 0f7216f..6054313 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -22,7 +22,7 @@ from .. import mesonlib from ..environment import detect_cpu_family from .base import (DependencyException, ExternalDependency) -from .misc import ThreadDependency +from .misc import threads_factory # On windows 3 directory layouts are supported: # * The default layout (versioned) installed: @@ -105,7 +105,9 @@ class BoostDependency(ExternalDependency): self.requested_modules = self.get_requested(kwargs) if 'thread' in self.requested_modules: - self._add_sub_dependency(ThreadDependency, environment, kwargs) + if not self._add_sub_dependency2(threads_factory(environment, self.for_machine, {})): + self.is_found = False + return self.boost_root = None self.boost_roots = [] -- cgit v1.1