diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-25 22:50:35 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-27 00:55:27 +0300 |
| commit | 463d08d5459a05807e63c833b56614bc8c59643a (patch) | |
| tree | 28183ff6af3991f549f8eb9151a8a2c56e477ebe /environment.py | |
| parent | eb3cdb6f8d380da19231affd176deb8088481a5a (diff) | |
| download | meson-463d08d5459a05807e63c833b56614bc8c59643a.zip meson-463d08d5459a05807e63c833b56614bc8c59643a.tar.gz meson-463d08d5459a05807e63c833b56614bc8c59643a.tar.bz2 | |
Now host_machine, build_machine and target_machine are properly separated and return correct values.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/environment.py b/environment.py index 987dbc8..82c909e 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['hostmachine']['name'] == 'windows'): + or (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['name'] == '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['hostmachine']['name'] == 'darwin'): + (cross and self.cross_info.has_host() and self.cross_info.config['host_machine']['name'] == 'darwin'): self.shared_lib_suffix = 'dylib' else: self.shared_lib_suffix = 'so' @@ -623,7 +623,7 @@ class CrossBuildInfo(): raise EnvironmentException('Malformed value in cross file variable %s.' % varname) def has_host(self): - return 'hostmachine' in self.config + return 'host_machine' in self.config def has_target(self): - return 'targetmachine' in self.config + return 'target_machine' in self.config |