diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-19 20:06:49 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-17 19:19:24 +0300 |
| commit | 181510bd6eb767361da5e02e41be08cc65b36b08 (patch) | |
| tree | bbd53801c1f1a9d8ad65405c5fe5de445a5aacba /mesonbuild/compilers/c.py | |
| parent | 8396c4f3e6bfea6bbef6539055090902c089d375 (diff) | |
| download | meson-181510bd6eb767361da5e02e41be08cc65b36b08.zip meson-181510bd6eb767361da5e02e41be08cc65b36b08.tar.gz meson-181510bd6eb767361da5e02e41be08cc65b36b08.tar.bz2 | |
Fix checks on MinGW and VS2010.
Diffstat (limited to 'mesonbuild/compilers/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 99c7cf4..4aac542 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -820,7 +820,7 @@ class VisualStudioCCompiler(CCompiler): '2': ['/W3'], '3': ['/W4']} self.base_options = ['b_pch'] # FIXME add lto, pgo and the like - self.is_64 = True + self.is_64 = is_64 # Override CCompiler.get_always_args def get_always_args(self): @@ -1010,6 +1010,11 @@ class VisualStudioCCompiler(CCompiler): def get_instruction_set_args(self, instruction_set): if self.is_64: return vs64_instruction_set_args.get(instruction_set, None) + if self.version.split('.')[0] == '16' and instruction_set == 'avx': + # VS documentation says that this exists and should work, but + # it does not. The headers do not contain AVX intrinsics + # and the can not be called. + return None return vs32_instruction_set_args.get(instruction_set, None) |