diff options
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index ffc1424..c5c69e0 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -51,7 +51,7 @@ class HDF5PkgConfigDependency(PkgConfigDependency): newinc = [] # type: T.List[str] for arg in self.compile_args: if arg.startswith('-I'): - stem = 'static' if kwargs.get('static', False) else 'shared' + stem = 'static' if self.static else 'shared' if (Path(arg[2:]) / stem).is_dir(): newinc.append('-I' + str(Path(arg[2:]) / stem)) self.compile_args += newinc @@ -129,7 +129,7 @@ class HDF5ConfigToolDependency(ConfigToolDependency): # We first need to call the tool with -c to get the compile arguments # and then without -c to get the link arguments. args = self.get_config_value(['-show', '-c'], 'args')[1:] - args += self.get_config_value(['-show', '-noshlib' if kwargs.get('static', False) else '-shlib'], 'args')[1:] + args += self.get_config_value(['-show', '-noshlib' if self.static else '-shlib'], 'args')[1:] for arg in args: if arg.startswith(('-I', '-f', '-D')) or arg == '-pthread': self.compile_args.append(arg) diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index d573c88..5292d02 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -196,7 +196,6 @@ class Python3DependencySystem(SystemDependency): return self.name = 'python3' - self.static = kwargs.get('static', False) # We can only be sure that it is Python 3 at this point self.version = '3' self._find_libpy3_windows(environment) |