diff options
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 57a6a96..fb7b017 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -26,6 +26,7 @@ from .base import ( DependencyException, DependencyMethods, ExternalDependency, PkgConfigDependency, strip_system_libdirs, ConfigToolDependency, ) +from .misc import ThreadDependency def get_shared_library_suffix(environment, native): @@ -45,6 +46,7 @@ class GTestDependency(ExternalDependency): self.main = kwargs.get('main', False) self.src_dirs = ['/usr/src/gtest/src', '/usr/src/googletest/googletest/src'] self.detect() + self.ext_deps.append(ThreadDependency(environment, kwargs)) def detect(self): gtest_detect = self.clib_compiler.find_library("gtest", self.env, []) @@ -83,9 +85,6 @@ class GTestDependency(ExternalDependency): return True return False - def need_threads(self): - return True - def log_info(self): if self.prebuilt: return 'prebuilt' @@ -118,6 +117,7 @@ class GMockDependency(ExternalDependency): def __init__(self, environment, kwargs): super().__init__('gmock', environment, 'cpp', kwargs) self.main = kwargs.get('main', False) + self.ext_deps.append(ThreadDependency(environment, kwargs)) # If we are getting main() from GMock, we definitely # want to avoid linking in main() from GTest @@ -167,9 +167,6 @@ class GMockDependency(ExternalDependency): self.is_found = False - def need_threads(self): - return True - def log_info(self): if self.prebuilt: return 'prebuilt' @@ -262,6 +259,7 @@ class LLVMDependency(ConfigToolDependency): self._set_old_link_args() self.link_args = strip_system_libdirs(environment, self.link_args) self.link_args = self.__fix_bogus_link_args(self.link_args) + self.ext_deps.append(ThreadDependency(environment, kwargs)) @staticmethod def __fix_bogus_link_args(args): @@ -399,9 +397,6 @@ class LLVMDependency(ConfigToolDependency): self.module_details.append(mod + status) - def need_threads(self): - return True - def log_details(self): if self.module_details: return 'modules: ' + ', '.join(self.module_details) |