diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/c.py | 7 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 |
2 files changed, 7 insertions, 2 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) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 76e6f60..0be3908 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -262,7 +262,7 @@ vs64_instruction_set_args = {'mmx': ['/arch:AVX'], 'avx': ['/arch:AVX'], 'avx2': ['/arch:AVX2'], 'neon': None, -} + } def sanitizer_compile_args(value): |