diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-26 18:15:25 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-26 14:16:13 -0400 |
| commit | 5dab5f160046c800a11b7da436ce974b5f7d0271 (patch) | |
| tree | a4e8e486eb9cef0b5d6070ab6510ceec92a58d3f | |
| parent | fab5634916191816ddecf1a2a958fa7ed2eac1ec (diff) | |
| download | meson-5dab5f160046c800a11b7da436ce974b5f7d0271.zip meson-5dab5f160046c800a11b7da436ce974b5f7d0271.tar.gz meson-5dab5f160046c800a11b7da436ce974b5f7d0271.tar.bz2 | |
environment: Fix exception when no defines were found
Lists are not hashable.
Closes https://github.com/mesonbuild/meson/issues/1989
| -rw-r--r-- | mesonbuild/environment.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 3be068a..1e4e04b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -514,7 +514,7 @@ class Environment: if 'Free Software Foundation' in out: defines = self.get_gnu_compiler_defines(compiler) if not defines: - popen_exceptions[compiler] = 'no pre-processor defines' + popen_exceptions[' '.join(compiler)] = 'no pre-processor defines' continue gtype = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) @@ -566,7 +566,7 @@ class Environment: if 'GNU Fortran' in out: defines = self.get_gnu_compiler_defines(compiler) if not defines: - popen_exceptions[compiler] = 'no pre-processor defines' + popen_exceptions[' '.join(compiler)] = 'no pre-processor defines' continue gtype = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) @@ -617,7 +617,7 @@ class Environment: if 'Free Software Foundation' in out: defines = self.get_gnu_compiler_defines(compiler) if not defines: - popen_exceptions[compiler] = 'no pre-processor defines' + popen_exceptions[' '.join(compiler)] = 'no pre-processor defines' continue gtype = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) @@ -643,7 +643,7 @@ class Environment: if 'Free Software Foundation' in out: defines = self.get_gnu_compiler_defines(compiler) if not defines: - popen_exceptions[compiler] = 'no pre-processor defines' + popen_exceptions[' '.join(compiler)] = 'no pre-processor defines' continue gtype = self.get_gnu_compiler_type(defines) version = self.get_gnu_version_from_defines(defines) |