diff options
| author | William F Godoy <williamfgc@yahoo.com> | 2020-08-06 13:09:18 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-08-11 09:42:18 -0700 |
| commit | 847d652c4ef179bbf94c0e322dc3277858fcf08c (patch) | |
| tree | ace6c4570d7848501453cf01658fe5990e7ffad0 /mesonbuild/dependencies | |
| parent | f2890cbf9746ed76b113d32dffebdc9ade202a59 (diff) | |
| download | meson-847d652c4ef179bbf94c0e322dc3277858fcf08c.zip meson-847d652c4ef179bbf94c0e322dc3277858fcf08c.tar.gz meson-847d652c4ef179bbf94c0e322dc3277858fcf08c.tar.bz2 | |
Add h5cc shlib argument for correctly link hdf5 libraries
respect "static" key in dependency function
-shlib for static dependency
-noshlib for static dependency
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index fadd109..6a9bf2d 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -105,7 +105,8 @@ class HDF5Dependency(ExternalDependency): prog = ExternalProgram(wrappers[lang], silent=True) if not prog.found(): return - cmd = prog.get_command() + ['-show'] + shlib_arg = '-noshlib' if kwargs.get('static', False) else '-shlib' + cmd = prog.get_command() + [shlib_arg, '-show'] p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, timeout=15) if p.returncode != 0: mlog.debug('Command', mlog.bold(cmd), 'failed to run:') |