diff options
| author | George Sedov <radist.morse@gmail.com> | 2023-07-17 17:38:13 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-07-23 13:52:39 -0400 |
| commit | b6e306ea5ba16c1668f613267f1627cd6aa6476c (patch) | |
| tree | c09195430abdda1fcf17df033acb557c6e98ddf8 | |
| parent | 76dd44d6cb699096e656487e77aef1c92ddf79c1 (diff) | |
| download | meson-b6e306ea5ba16c1668f613267f1627cd6aa6476c.zip meson-b6e306ea5ba16c1668f613267f1627cd6aa6476c.tar.gz meson-b6e306ea5ba16c1668f613267f1627cd6aa6476c.tar.bz2 | |
hdf5: fix wrong env values for config tool
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index 392bb09..b0ce2be 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -98,12 +98,15 @@ class HDF5ConfigToolDependency(ConfigToolDependency): if language == 'c': cenv = 'CC' + lenv = 'C' tools = ['h5cc', 'h5pcc'] elif language == 'cpp': cenv = 'CXX' + lenv = 'CXX' tools = ['h5c++', 'h5pc++'] elif language == 'fortran': cenv = 'FC' + lenv = 'F' tools = ['h5fc', 'h5pfc'] else: raise DependencyException('How did you get here?') @@ -120,11 +123,11 @@ class HDF5ConfigToolDependency(ConfigToolDependency): compiler = environment.coredata.compilers[for_machine][language] try: os.environ[f'HDF5_{cenv}'] = join_args(compiler.get_exelist()) - os.environ[f'HDF5_{cenv}LINKER'] = join_args(compiler.get_linker_exelist()) + os.environ[f'HDF5_{lenv}LINKER'] = join_args(compiler.get_linker_exelist()) super().__init__(name, environment, nkwargs, language) finally: del os.environ[f'HDF5_{cenv}'] - del os.environ[f'HDF5_{cenv}LINKER'] + del os.environ[f'HDF5_{lenv}LINKER'] if not self.is_found: return |