diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-08-24 01:55:00 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-08-24 01:55:00 +0300 |
| commit | ed6baa31f66e05feb307282fe04f69aa13ac217b (patch) | |
| tree | 10d82aa57096a78555df02d58c5d8a4843c02507 | |
| parent | 0259f906f2c6db0d6181a37cbd4ba3ee70fa9269 (diff) | |
| download | meson-ed6baa31f66e05feb307282fe04f69aa13ac217b.zip meson-ed6baa31f66e05feb307282fe04f69aa13ac217b.tar.gz meson-ed6baa31f66e05feb307282fe04f69aa13ac217b.tar.bz2 | |
Use host naming conventions for files.
| -rw-r--r-- | environment.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/environment.py b/environment.py index 0fb2173..404765f 100644 --- a/environment.py +++ b/environment.py @@ -713,8 +713,10 @@ class Environment(): self.default_objcpp = ['c++'] self.default_static_linker = 'ar' self.vs_static_linker = 'lib' - - if is_windows(): + + cross = self.is_cross_build() + if (not cross and is_windows()) \ + or (cross and self.cross_info['name'] == 'windows'): self.exe_suffix = 'exe' self.shared_lib_suffix = 'dll' self.shared_lib_prefix = '' @@ -723,7 +725,8 @@ class Environment(): self.object_suffix = 'obj' else: self.exe_suffix = '' - if is_osx(): + if (not cross and is_osx()) or \ + (cross and self.cross_info['name'] == 'darwin'): self.shared_lib_suffix = 'dylib' else: self.shared_lib_suffix = 'so' @@ -731,7 +734,7 @@ class Environment(): self.static_lib_suffix = 'a' self.static_lib_prefix = 'lib' self.object_suffix = 'o' - + def is_cross_build(self): return self.cross_info is not None |