diff options
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 0fe702f..dc1498a 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -634,7 +634,7 @@ class PkgConfigDependency(ExternalDependency): continue if self.clib_compiler: args = self.clib_compiler.find_library(lib[2:], self.env, - list(libpaths), libtype) + list(libpaths), [], libtype) # If the project only uses a non-clib language such as D, Rust, # C#, Python, etc, all we can do is limp along by adding the # arguments as-is and then adding the libpaths at the end. diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 59d8070..126a9f7 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -352,7 +352,7 @@ class BoostDependency(ExternalDependency): return None def find_libraries_with_abi_tag(self, tag): - + extra_args = [] # All modules should have the same tag self.lib_modules = {} @@ -361,7 +361,7 @@ class BoostDependency(ExternalDependency): for module in self.requested_modules: libname = 'boost_' + module + tag - args = self.clib_compiler.find_library(libname, self.env, self.extra_lib_dirs()) + args = self.clib_compiler.find_library(libname, self.env, self.extra_lib_dirs(), extra_args) if args is None: mlog.debug("Couldn\'t find library '{}' for boost module '{}' (ABI tag = '{}')".format(libname, module, tag)) all_found = False diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 4ea3385..9971aed 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -36,8 +36,8 @@ class GTestDependency(ExternalDependency): def detect(self): self.version = '1.something_maybe' - gtest_detect = self.clib_compiler.find_library("gtest", self.env, []) - gtest_main_detect = self.clib_compiler.find_library("gtest_main", self.env, []) + gtest_detect = self.clib_compiler.find_library("gtest", self.env, [], []) + gtest_main_detect = self.clib_compiler.find_library("gtest_main", self.env, [], []) if gtest_detect and (not self.main or gtest_main_detect): self.is_found = True self.compile_args = [] @@ -83,7 +83,7 @@ class GMockDependency(ExternalDependency): self.version = '1.something_maybe' # GMock may be a library or just source. # Work with both. - gmock_detect = self.clib_compiler.find_library("gmock", self.env, []) + gmock_detect = self.clib_compiler.find_library("gmock", self.env, [], []) if gmock_detect: self.is_found = True self.compile_args = [] |