diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
| commit | e6a868e533724aeeb0e8450d511f30c7f8f22f6d (patch) | |
| tree | 9a60a3442c2cb2bfba9ef36e632602e12249e44f /environment.py | |
| parent | 24d23c3086afe687cc93b26a07f504902f4a0b02 (diff) | |
| parent | 78739afd9c75fd0b7265536c41922abe7be7a8e4 (diff) | |
| download | meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.zip meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.gz meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.bz2 | |
Merge pull request #229 from mesonbuild/crossname
Use system() instead of name() which is a confusing term.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/environment.py b/environment.py index c594776..abacbe0 100644 --- a/environment.py +++ b/environment.py @@ -91,7 +91,7 @@ class Environment(): cross = self.is_cross_build() if (not cross and mesonlib.is_windows()) \ - or (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['name'] == 'windows'): + or (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['system'] == 'windows'): self.exe_suffix = 'exe' self.import_lib_suffix = 'lib' self.shared_lib_suffix = 'dll' @@ -102,7 +102,7 @@ class Environment(): else: self.exe_suffix = '' if (not cross and mesonlib.is_osx()) or \ - (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['name'] == 'darwin'): + (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['system'] == 'darwin'): self.shared_lib_suffix = 'dylib' else: self.shared_lib_suffix = 'so' |